diff --git a/html/caisse.php b/html/caisse.php deleted file mode 100644 index 130970b59..000000000 --- a/html/caisse.php +++ /dev/null @@ -1,69 +0,0 @@ - - - '; - -for ($i=0;$i<10;$i++) -{ - echo 'montant '; - echo ''; - echo '
'; -} - - - -for ($i=0; $i < 5;$i++) -{ - echo ''; -} -?> - - - diff --git a/html/image/loading.gif b/html/image/loading.gif index 648ab1709..1d47a9dda 100644 Binary files a/html/image/loading.gif and b/html/image/loading.gif differ diff --git a/html/index.php b/html/index.php index 8474131ab..069dcc39d 100644 --- a/html/index.php +++ b/html/index.php @@ -30,7 +30,7 @@ * ce fichier deviendra l'un des patch *
  • Faire de la doc
    • * - * + * *

    * \section conseil Conseils *

    @@ -63,7 +63,7 @@ * * \section convention_code Coding convention *

    - * Some coding conventions to have a homogene code + * Some coding conventions to have a homogene code *

      *
    1. Reuse the existing code ,
      2. *
    2. Improve and check that the function is still working
      3. @@ -71,7 +71,7 @@ *
    3. In the folder include: filenames ending by *.inc.php will be executer after being included
      4. *
    4. Dans le répertoire include: Les noms de fichiers sont *.php pour les fichiers contenant des fonctions uniquement
      5. *
    5. In the folder include: filenames end by *.php if they contains only function
      6. - *
    6. In the folder include: filenames starting with + *
    7. In the folder include: filenames starting with * class_*.php if it is related to a class.
      8. *
    8. In the folder include/template: files for the HTML presentation *
      9. @@ -79,7 +79,7 @@ * *
    9. Write documentation
      10. *
    - * + * *

    * \section advice Advices *

    @@ -122,8 +122,8 @@ echo ' */ div.add_todo_list { - border:1px solid blue; - display:none; - background-color:#CFCDFF; - padding:3; - position:absolute; - text-align:left; - line-height:3em; - z-index:1} -div.gest_name { - float:right; - margin-right:150; - margin-top:15 -} -h2.gest_name { - border-left: 1px solid #403a8d; - border-bottom:1px solid #403a8d; - border-top:1px solid #403a8d; - border-right:1px solid #403a8d; - padding: 5px; - font-size:140%; - color:#403a8d; + border:1px solid blue; + display:none; + background-color:#BFD0FF; + padding:3; + position:absolute; + text-align:left; + line-height:3em; + z-index:1} +div.welcome { +} +div.gest_name { + float:right; + margin-right:150; + margin-top:15 +} +h2.gest_name { + border-left: 5px solid #403a8d; + border-bottom:1px solid #b4bbc2; + border-top:1px solid #b4bbc2; + border-right:1px solid #b4bbc2; + padding: 5px; } div.op_detail_frame { - background-color:#e4e7ed; - height:100%; width:100%; + background-color:#e4e7ed; + height:100%; width:100%; } div.inner_box { - background-color:#ccffcc; - font-size:10; - font-family:helvetica,arial,sans-serif; - padding:0; - margin:0; - overflow:hidden; - z-index:3; + background-color:#e4e7ed; + font-size:10; + font-family:helvetica,sans-serif; + padding:0; + margin:0; + overflow:hidden; + z-index:3; - position:absolute; - left:10%; +position:absolute; +left:10%; - border:1px solid darkblue; +border:1px solid darkblue; } div.op_detail_title { - background-color:grey; - /* width:500;*/ + background-color:grey; +/* width:500;*/ } div#div_jrn{ - position:absolute; - border:1px solid black; - top:15%;left:100; - visibility:hidden; - z-index:2; - width:50em; - background-color:#EDF3FF; + position:absolute; + border:1px solid black; + top:15%;left:100; + visibility:hidden; + z-index:2; + width:50em; + background-color:#EDF3FF; } -div#div_cat{ - position:absolute; - border:1px solid black; - top:15%;left:100; - visibility:hidden; - z-index:2; - width:50em; - background-color:#EDF3FF; + div#div_cat{ + position:absolute; + border:1px solid black; + top:15%;left:100; + visibility:hidden; + z-index:2; + width:50em; + background-color:#EDF3FF; } + div.divinfo -{ color:red;text-align:right;display:block;width:30em;height:13;} +{ color:red;text-align:right;display:block;width:30em;height:13;font-weight:bold} div#search_form { - position:absolute; - border:1px solid black; - top:15%;left:100; - margin-left:25% - z-index:2; - width:50%; - display:none; - background-color:#e4e7ed; + position:absolute; + border:1px solid black; + top:15%;left:100; + margin-left:25% + z-index:2; + width:50%; + display:none; + background-color:#e4e7ed; } -table.result td + +table.table_large td, table.result td { - padding-left:5px; - padding-right:5px; + padding-left:5px; + padding-right:5px; } table.info_op { - margin-left: 30%; - margin-right: 30%; + font-size:18; + margin-right:30%; width:20%; } @@ -934,11 +946,11 @@ table.info_op tr { font-size:14; background:white; -width:5% } h2#jrn_name { margin-right:30%; + float: right; } tr.footer{ @@ -951,6 +963,7 @@ span.remain { font-weight: bold; color:black; } + div#jrn_name_div { float: right; @@ -966,14 +979,14 @@ div#jrn_name_div #direct { display:inline; - float:right; - + float:left; + width:400px; } -.direct +#calc { - font-size:6px; - border:groove 1px #00ff00; + display:inline; + float:left; } div#wait_box { @@ -1005,4 +1018,57 @@ div#div_jrnsearch_op{ width:50em; background-color:#EDF3FF; +} +ul { + padding-left: 110px; +} +a.line,div.content a.line +{ +font-size:110%; + text-decoration:underline; + display:inline; + color: #0000ff; +} +a.line:hover,div_content a.line +{ +font-size:110%; + text-decoration:underline; + display:inline; + color: #0000ff; + background-color: rgb(93, 144, 205); +} +#close_div +{ + background-color:white; + color:blue; + text-decoration:none; + border:1px solid blue; + margin-left: 2px; + margin-right:2px; + margin-top:0px; + font-size:10px; +} +table.table_large tr.odd ,table.table_large tr.even { + + height:32px; +} +#calc1 +{ + position:absolute; + display:block; + top:30px; + left:150px; + width:300px; + border:1px solid black; + background-color:#aec3e8; + font-size:16px; + padding: 20px 20px; +} +span.invoice +{ + font-size: 120%; + font-style: italic; + display:block; + margin: 20px; + font-weight: bold; } \ No newline at end of file diff --git a/html/style-light.css b/html/style-light.css index 008654e19..04a89dae1 100644 --- a/html/style-light.css +++ b/html/style-light.css @@ -3,18 +3,18 @@ BODY { background-color:#EDF3FF; font-size:10; - color:blue; - font-family:helvetica,arial,sans-serif; + font-family:helvetica,sans-serif; padding: 0px 10px 0px 10px ; margin:0; + color:blue; } .notice { color:red; font-style: italic; } -table.result ,table.resultfooter { - color:#0000ff; +table.table_large, table.result ,table.resultfooter { + color:blue; /* border:blue solid 1px; */ width:100%; border-spacing: 0px; @@ -27,10 +27,10 @@ table.resultfooter tfoot { } -table.result th { +table.table_large th,table.result th { font-weight:bold; - font-family:helvetica,arial,sans-serif; - border-bottom:1px solid black; + font-family:helvetica,sans-serif; + border-bottom:1px solid blue; border-top:0; color:#25238F; @@ -40,7 +40,7 @@ table.result th { } h2 { - font-family:Helvetica,arial,sans-serif; + font-family:helvetica,sans-serif; font-size:14px; color:grey; } @@ -86,7 +86,7 @@ h3.info { } h2.info2 { - color:#0000ff; + color:blue; font-size:14px; text-align:center; @@ -100,7 +100,7 @@ h2.error { } h1.title { - color: #0000ff; + color: blue; font-size:25px; } @@ -125,7 +125,6 @@ div.u_tmenu div.u_tool { div.u_tool { float:left; width: 100%; - } div.u_tool div.name { float:left; @@ -150,8 +149,9 @@ div.lmenu { } div.lextmenu { + float:left; - font-family:helvetica,arial,sans-serif; + font-family:helvetica,sans-serif; font-size:9px; } @@ -166,47 +166,49 @@ div.searchmenu { div.recherche_form{ width:700px; font-size:9px; - font-family:Helvetica,arial,sans-serif; + font-family:helvetica,sans-serif; border-style:outset; border-width:1px; } div.redcontent{ + float:left; padding-top:7px; padding-left:8px; font-size:9px; - font-family:helvetica,arial,sans-serif; + font-family:helvetica,sans-serif; width:75%; } div.content{ + float:left; padding-top:7px; - width:96%; - font-family:helvetica,arial,sans-serif; + width:100%; + font-family:helvetica,sans-serif; clear:both; - margin-left:2%; } div.content30{ + float:left; padding-top:7px; width:35%; - font-family:helvetica,arial,sans-serif; + font-family:helvetica,sans-serif; } div.no span{ position:static; - font-family:helvetica,arial,sans-serif; + font-family:helvetica,sans-serif; font-weight:bold; color:red; } table.document { - color:#0000ff; + color:blue; width:100%; border-spacing: 0px; border-collapse:collapse; @@ -214,8 +216,8 @@ table.document { } table.document th{ font-weight:bold; - font-family:helvetica,arial,sans-serif; - border-bottom:2px solid #0000ff; + font-family:helvetica,sans-serif; + border-bottom:2px solid blue; border-top:0; color:#25238F; text-align: left; @@ -225,9 +227,10 @@ table.document th{ .error { width:60%; margin-left:20%; +text-align: center; + color:white; background-color:red; -text-align: center; font-weight: bolder; font-size:120%; } @@ -260,7 +263,7 @@ td.msubtitle { } span.mtitle { color:gray; - background-color:#0000ff; + background-color:blue; font-size:10px; border-style:groove } @@ -276,14 +279,12 @@ span.even { tr.odd { background-color:#DDE6FF; font-size:10px; - border-width:0px; } tr { font-size:10px; } td.odd{ background-color:#DDE6FF ; - border-width:0px; font-size:10px; } td.even{ @@ -296,7 +297,7 @@ td.cell{ } td.selectedcell{ border-style:inset; - border-color:#0000ff; + border-color:blue; border-width:1pt ; font-size:10px; background:#5D90CD ; @@ -308,7 +309,7 @@ a.mtitle { font-size:10px; text-decoration:none; display:inline; - color: #0000ff; + color: blue; } a.mtitle:hover { @@ -316,7 +317,7 @@ a.mtitle:hover { text-decoration:none; display:inline; - color: darkblue; + color: yellow; background-color:#5D90CD; } @@ -337,35 +338,35 @@ tr.odd:hover td { text-decoration:none; background-color: #a9d6e4; - color:white; + color:yellow; } tr.even:hover td { text-decoration:none; background-color: #a9d6e4; - color:white; + color:yellow; } td.mtitle:hover,td.mtitle:hover a { background-color:#a9d6e4; - color:white; + color:yellow; } td.msubtitle:hover,td.msubtitle:hover a { background-color:#a9d6e4; - color:white; + color:yellow; } a.cell { text-decoration:none; display:block; - color:#0000ff; + color:blue; background-color:white; font-size:9px; } a.cell:hover { font-size:9px; - color:white; + color:yellow; background-color:#5D90CD; text-decoration:none; display:block; @@ -395,16 +396,16 @@ a.one:hover { a.detail { font-size:9px; - font-family:helvetica,arial,sans-serif; + font-family:helvetica,sans-serif; text-decoration: none; display: block; - color: #0000ff; + color: blue; } a.detail:hover { font-size:9px; - font-family:helvetica,arial,sans-serif; + font-family:helvetica,sans-serif; color: white; background-color: rgb(93, 144, 205); text-decoration: none; @@ -416,15 +417,15 @@ li.menuv,ol.menuv { padding:1em 1em; } div.redcontent a { - font-family:helvetica,arial,sans-serif; + font-family:helvetica,sans-serif; text-decoration: none; display: block; - color: #0000ff; + color: blue; } div.redcontent a:hover { - font-family:helvetica,arial,sans-serif; + font-family:helvetica,sans-serif; color: white; background-color: rgb(93, 144, 205); text-decoration: none; @@ -432,17 +433,17 @@ div.redcontent a:hover { } div.content a { - font-family:helvetica,arial,sans-serif; + font-family:helvetica,sans-serif; text-decoration: none; display: block; color: blue; -padding: 1px ; +padding: 0; } div.content a:hover { - font-family:helvetica,arial,sans-serif; + font-family:helvetica,sans-serif; color: white; background-color: rgb(93, 144, 205); text-decoration: none; @@ -471,7 +472,7 @@ div.content a.mtitle { font-size:10px; text-decoration:none; display:inline; - color:#0000ff; + color:blue; @@ -486,34 +487,34 @@ div.content a.mtitle:hover { } div.redcontent input.text { - font-family:helvetica,arial,sans-serif; + font-family:helvetica,sans-serif; font-weight:normal; border-color:336699; border-style:solid; - background-color:orange; + background-color:greenyellow; border-width:1px; - color:#0000ff; + color:blue; } div.content input.text { - font-family:helvetica,arial,sans-serif; + font-family:helvetica,sans-serif; font-weight:normal; border-color:336699; border-style:solid; border-width:1px; - background-color:orange; - color:#0000ff; + background-color:greenyellow; + color:blue; } div.redcontent input:focus { - background-color:orange; + background-color:greenyellow; } div.content input:focus { - background-color:orange; + background-color:greenyellow; } div.redcontent textarea:focus { -background-color: orange; +background-color: greenyellow; } .document { color: #1a207d; @@ -531,11 +532,13 @@ a.document:hover { } .input_text { - border:groove 1px #0000ff; + border:groove 1px blue; margin:1px; } .input_text:hover { - background-color: yellow; + border:groove 1px blue; + margin:1px; + background-color: greenyellow; } legend { font-weight: bold; @@ -548,7 +551,7 @@ fieldset fieldset legend { color:grey; } select { -border: 1px solid #0000ff; +border: 1px solid blue; margin:2px; background-color:white; @@ -561,15 +564,15 @@ background-color:white; position:absolute; border:1px solid black; background-color:yellow; - top:0;left:0; - visibility:hidden; - z-index:2; - width:25em; padding-bottom: 10; padding-top: 10; padding-left: 10; padding-right: 10; - + color:black; + top:0;left:0; + visibility:hidden; + width:25em; + z-index:20; } span.action { @@ -604,12 +607,12 @@ div.popup_back{ position:absolute; top:0px; left:0px; + opacity:0.6; width:100%; -height: 150%; - + height:100%; z-index:1; /*background-color:lightgrey;*/ - /*background-color: rgba(203, 203,203, 0.2);*/ + display:none; } @@ -625,7 +628,7 @@ div.popup_border_title { border: 2px outset #201e87; background-color:#879ED4; font-size: 110% ; - font-family: helvetica,arial,sans-serif; + font-family: helvetica,sans-serif; font-style: italic; font-weight: bolder; text-align:center; @@ -647,7 +650,7 @@ div.popup_border_notitle { /*border:dotted 1px black;*/ border: 3px outset #201e87; background-color: #879ED4; - font-family: helvetica,arial,sans-serif; + font-family: helvetica,sans-serif; font-style: italic; font-weight: bolder; text-align:center; @@ -667,9 +670,9 @@ div.popup_content { width:100%; height:96%; overflow: auto; - background-color:#e4e7ed; + background-color:#DFE7FF; font-size:10px ; - font-family: helvetica,arial,sans-serif; + font-family: helvetica,sans-serif; font-style: normal; font-weight: normal; color: black; @@ -682,41 +685,36 @@ div.popup_content { div.autocomplete { position:relative; background-color:white; + border:1px solid #888; margin:0; padding:0; text-align:left; font-size:12px; } -span.informal { - font-size:12px; - - } div.autocomplete em { - color:#0000ff; + color:blue; font-weight:bold; } div.autocomplete ul { list-style-type:none; - width: 350px; background-color:white; + border:1px solid #888; + width:375px; margin:0; padding:0; - border:1px solid #888; } div.autocomplete ul li.selected { background-color: lightblue;} div.autocomplete ul li { list-style-type:none; - width: auto; display:block; margin:0; padding:0px; /*height:32px;*/ - border:1px dotted #e6e6fa; - cursor:pointer; } +span.informal{ font-size:95%; color:black;} ul.select_table { /*padding:5px;*/ @@ -794,32 +792,37 @@ color:black; cursor:inherit; } -.button , a.button,div.content a.button { +a#anchorbutton, .button, a.button,div.content a.button { font-size:10; - color:white; + color:black; font-weight: bold; text-decoration:none; - font-family: helvetica,arial,sans-serif; - background-image: url("image/bg-submit3.gif"); + font-family: helvetica,sans-serif,arial; + background-color: #DFDFDF; background-repeat: repeat-x; background-position: left; - - border-style: outset ; - border-color: #0000ff ; - border-width:0; - padding:2 4 2 4; + height:32px; + border-color: gray; + border-style: outset; + border-width:2; + padding-bottom: 4; + padding-top: 4; + padding-right: 6; + padding-left: 6; + margin-top:3px; cursor:pointer; margin:1 2 1 2; - -moz-border-radius:2 2; + -moz-border-radius:6; + border-radius:6; } -.button:hover, a.button:hover,div.content a.button:hover { +a#anchorbutton:hover, .button:hover,a.button:hover,div.content a.button:hover { cursor:pointer; background-color:white; - border-style: inset ; - color:#0000ff; + color:black; margin:1 2 1 2; + border-style: inset; } td.tool { border: solid 1px gray; @@ -840,37 +843,9 @@ margin:0; padding:0; text-align:center; } -a#anchorbutton { - font-size:10; - color:white; - font-weight: bold; - - text-decoration:none; - font-family: helvetica,arial,sans-serif; - background-image: url("image/bg-submit3.gif"); - background-repeat: repeat-x; - background-position: left; - - border-style: outset ; - border-color: #0000ff ; - border-width:1; - padding:2 4 2 4; - cursor:pointer; - margin:1 2 1 2; - -moz-border-radius:2 2; - -} -a#anchorbutton:hover { - cursor:pointer; - background-color:white; - border-style: inset ; - color:#0000ff; - - margin:1 2 1 2; - } /* */ div.add_todo_list { - border:1px solid #0000ff; + border:1px solid blue; display:none; background-color:#BFD0FF; padding:3; @@ -900,9 +875,9 @@ div.op_detail_frame { } div.inner_box { - background-color:#e4e7ed; + background-color:whitesmoke; font-size:10; - font-family:helvetica,arial,sans-serif; + font-family:helvetica,sans-serif; padding:0; margin:0; overflow:hidden; @@ -945,27 +920,27 @@ div#div_jrn{ div.divinfo { color:red;text-align:right;display:block;width:30em;height:13;font-weight:bold} - div#search_form { position:absolute; border:1px solid black; top:15%;left:100; - margin-left:25%; + margin-left:25% z-index:2; width:50%; display:none; background-color:#e4e7ed; } -table.result td + +table.table_large td, table.result td { padding-left:5px; padding-right:5px; } table.info_op { - margin-left: 30%; - margin-right: 30%; + font-size:18; + margin-right:30%; width:20%; } @@ -973,17 +948,12 @@ table.info_op tr { font-size:14; background:white; -width:5% } h2#jrn_name { - padding:0 ; - margin:0; + margin-right:30%; + float: right; - float:right; - font-size:18; - display: inline; - color:#15158e; } tr.footer{ font-size:14; @@ -995,6 +965,7 @@ span.remain { font-weight: bold; color:black; } + div#jrn_name_div { float: right; @@ -1010,17 +981,15 @@ div#jrn_name_div #direct { display:inline; - float:right; - + float:left; + width:400px; } -.direct +#calc { - font-size:6px; - border:groove 1px #33378d; - margin:1px; + display:inline; + float:left; } - div#wait_box { background-color:#F1E6E6; @@ -1053,5 +1022,55 @@ div#div_jrnsearch_op{ } ul { - padding-left: 100px; + padding-left: 110px; } +a.line,div.content a.line +{ +font-size:110%; + text-decoration:underline; + display:inline; + color: #0000ff; +} +a.line:hover,div_content a.line +{ +font-size:110%; + text-decoration:underline; + display:inline; + color: #0000ff; + background-color: rgb(93, 144, 205); +} +#close_div +{ + background-color:white; + color:blue; + text-decoration:none; + border:1px solid blue; + margin-left: 2px; + margin-right:2px; + margin-top:0px; + font-size:10px; +} +table.table_large tr.odd ,table.table_large tr.even { + + height:32px; +} +#calc1 +{ + position:absolute; + display:block; + top:30px; + left:150px; + width:300px; + border:1px solid black; + background-color:#aec3e8; + font-size:16px; + padding: 20px 20px; +} +span.invoice +{ + font-size: 120%; + font-style: italic; + display:block; + margin: 20px; + font-weight: bold; +} \ No newline at end of file diff --git a/include/class_acc_ledger_fin.php b/include/class_acc_ledger_fin.php index 2c341dd5c..e66b808de 100644 --- a/include/class_acc_ledger_fin.php +++ b/include/class_acc_ledger_fin.php @@ -185,7 +185,7 @@ class Acc_Ledger_Fin extends Acc_Ledger *\return string with html code *\note the form tag are not set here */ - function input($p_array=null) + function input($p_array=null,$notused=0) { global $g_parameter; if ( $p_array != null) @@ -384,7 +384,7 @@ class Acc_Ledger_Fin extends Acc_Ledger *\param $p_array an array usually is $_POST *\return string with code html */ - public function confirm($p_array) + public function confirm($p_array,$p_nothing=0) { global $g_parameter; $r=""; @@ -589,7 +589,7 @@ class Acc_Ledger_Fin extends Acc_Ledger *\param $p_array usually $_POST *\return string with HTML code */ - public function insert($p_array) + public function insert($p_array=null) { global $g_parameter; bcscale(2); diff --git a/include/class_acc_ledger_purchase.php b/include/class_acc_ledger_purchase.php index 43fb7e1dc..400897337 100644 --- a/include/class_acc_ledger_purchase.php +++ b/include/class_acc_ledger_purchase.php @@ -179,7 +179,7 @@ class Acc_Ledger_Purchase extends Acc_Ledger /* * check if the accounting for VAT are valid */ - $a_poste=split(',',$tva_rate->tva_poste); + $a_poste=explode(',',$tva_rate->tva_poste); if ( $this->db->get_value('select count(*) from tmp_pcmn where pcm_val=$1',array($a_poste[0])) == 0 || @@ -259,10 +259,6 @@ class Acc_Ledger_Purchase extends Acc_Ledger } - public function save($p_array) - { - echo "

    Acc_Ledger_Purchase::save Not implemented

    "; - } /*!\brief insert into the database, it calls first the verify function * change the value of this->jr_id and this->jr_internal. @@ -299,7 +295,7 @@ class Acc_Ledger_Purchase extends Acc_Ledger *\return string *\note throw an Exception */ - public function insert($p_array) + public function insert($p_array=null) { global $g_parameter; extract ($p_array); @@ -467,10 +463,7 @@ class Acc_Ledger_Purchase extends Acc_Ledger /* if the quantity is < 0 then the stock increase (return of * material) */ - $nNeg=($ - {"e_quant".$i - } - <0)?-1:1; + $nNeg=(${"e_quant" . $i}< 0) ? -1 : 1; // always save quantity but in withStock we can find // what card need a stock management @@ -680,6 +673,7 @@ class Acc_Ledger_Purchase extends Acc_Ledger $acc_operation->jrn=$p_jrn; $acc_operation->type='c'; $acc_operation->periode=$tperiode; + $acc_operation->insert_jrnx(); } } @@ -842,21 +836,6 @@ class Acc_Ledger_Purchase extends Acc_Ledger return $internal; } - public function update() - { - echo "

    Acc_Ledger_Purchase::update Not implemented

    "; - } - - public function load() - { - echo "

    Acc_Ledger_Purchase::load Not implemented

    "; - - } - - public function delete() - { - echo "

    Acc_Ledger_Purchase::delete Not implemented

    "; - } /*!\brief display the form for entering data for invoice *\param $p_array is null or you can put the predef operation or the $_POST \code @@ -889,7 +868,7 @@ class Acc_Ledger_Purchase extends Acc_Ledger \endcode *\return HTML string */ - public function input($p_array=null) + public function input($p_array=null,$p_readonly=0) { global $g_parameter; if ( $p_array != null ) extract($p_array); diff --git a/include/class_acc_ledger_sold.php b/include/class_acc_ledger_sold.php index 1b1e75389..18821e5c0 100644 --- a/include/class_acc_ledger_sold.php +++ b/include/class_acc_ledger_sold.php @@ -180,7 +180,7 @@ class Acc_Ledger_Sold extends Acc_Ledger /* * check if the accounting for VAT are valid */ - $a_poste=split(',',$tva_rate->tva_poste); + $a_poste=explode(',',$tva_rate->tva_poste); if ( $this->db->get_value('select count(*) from tmp_pcmn where pcm_val=$1',array($a_poste[0])) == 0 || @@ -221,10 +221,6 @@ class Acc_Ledger_Sold extends Acc_Ledger } - public function save($p_array) - { - echo "

    Acc_Ledger_Sold::save Not implemented

    "; - } /*!\brief insert into the database, it calls first the verify function, * change the value of this->jr_id and this->jr_internal @@ -234,7 +230,7 @@ class Acc_Ledger_Sold extends Acc_Ledger *\return string *\note throw an Exception */ - public function insert($p_array) + public function insert($p_array=null) { global $g_parameter; extract ($p_array); @@ -432,7 +428,7 @@ class Acc_Ledger_Sold extends Acc_Ledger $acc_operation->periode=$tperiode; if ($value < 0 ) $tot_debit=bcadd($tot_debit,abs($value)); $acc_operation->insert_jrnx(); - + // if TVA is on both side, we deduce it immediately if ( $oTva->get_parameter("both_side")==1) { @@ -613,21 +609,6 @@ class Acc_Ledger_Sold extends Acc_Ledger return $internal; } - public function update() - { - echo "

    Acc_Ledger_Sold::update Not implemented

    "; - } - - public function load() - { - echo "

    Acc_Ledger_Sold::load Not implemented

    "; - - } - - public function delete() - { - echo "

    Acc_Ledger_Sold::delete Not implemented

    "; - } /*!@brief show the summary of the operation and propose to save it *@param array contains normally $_POST. It proposes also to save @@ -983,7 +964,7 @@ class Acc_Ledger_Sold extends Acc_Ledger * *\return HTML string */ - function input($p_array=null) + function input($p_array=null,$p_readonly=0) { global $g_parameter; if ( $p_array != null ) extract($p_array); diff --git a/include/class_html_input.php b/include/class_html_input.php index b8e38ed70..c2a5c7cc5 100755 --- a/include/class_html_input.php +++ b/include/class_html_input.php @@ -222,7 +222,7 @@ class HtmlInput } static function warnbulle($p_comment) { - $r='XX'; + $r='Δ'; return $r; } /** diff --git a/include/class_jrn_def_sql.php b/include/class_jrn_def_sql.php index 01286a615..9e0352ab7 100644 --- a/include/class_jrn_def_sql.php +++ b/include/class_jrn_def_sql.php @@ -172,7 +172,7 @@ class Jrn_Def_sql return $oobj; } - public function insert() + public function insert($p_array=null) { if ($this->verify_sql() != 0) return;