lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git

Browse Source 
into develop

Conflicts:
	htdocs/core/modules/modCommissions.class.php
This commit is contained in:
Regis Houssin 2012-07-23 11:07:53 +02:00
commit 01ab1aa66f
8 changed files with 39 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
htdocs/admin/commissions.php
View File

@ -18,10 +18,9 @@
*/ */
/** /**
* \file /marges/admin/commissions.php * \file /htdocs/admin/commissions.php
* \ingroup marges * \ingroup commissions
* \brief Page to setup advanced commissions module * \brief Page to setup advanced commissions module
* \version $Id:$
*/ */
$res=@include("../main.inc.php"); // For root directory $res=@include("../main.inc.php"); // For root directory
@ -39,7 +38,7 @@ accessforbidden();
if ($conf->global->COMMISSION_BASE == "") { if ($conf->global->COMMISSION_BASE == "") {
if ($conf->marges->enabled) if ($conf->marges->enabled)
$conf->global->COMMISSION_BASE = "MARGES"; $conf->global->COMMISSION_BASE = "MARGES";
else else
$conf->global->COMMISSION_BASE = "CA"; $conf->global->COMMISSION_BASE = "CA";
} }
@ -80,11 +79,12 @@ if (isset($_POST['serviceCommissionRate']))
} }
} }
/* /*
* View * View
*/ */
llxHeader('',$langs->trans("commissionsSetup")); llxHeader('',$langs->trans("CommissionsSetup"));
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>'; $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
@ -93,7 +93,7 @@ print_fiche_titre($langs->trans("commissionsSetup"),$linkback,'setup');
$head = commissions_admin_prepare_head($adh); $head = commissions_admin_prepare_head($adh);
dol_fiche_head($head, 'parameters', $langs->trans("commissions"), 0, 'company'); dol_fiche_head($head, 'parameters', $langs->trans("Commissions"), 0, 'commissions');
print "<br>"; print "<br>";
@ -123,7 +123,7 @@ print ' />';
print $langs->trans("CommissionBasedOnCA"); print $langs->trans("CommissionBasedOnCA");
print '<br/>'; print '<br/>';
print '<input type="radio" name="commissionBase" value="MARGES" '; print '<input type="radio" name="commissionBase" value="MARGES" ';
if (!$conf->marges->enabled) if (!$conf->marges->enabled)
print 'disabled'; print 'disabled';
elseif ($conf->global->COMMISSION_BASE == "MARGES") elseif ($conf->global->COMMISSION_BASE == "MARGES")
print 'checked'; print 'checked';

2
htdocs/admin/margin.php
View File

@ -102,7 +102,7 @@ print_fiche_titre($langs->trans("margesSetup"),$linkback,'setup');
$head = marges_admin_prepare_head(); $head = marges_admin_prepare_head();
dol_fiche_head($head, 'parameters', $langs->trans("marges"), 0, 'company'); dol_fiche_head($head, 'parameters', $langs->trans("marges"), 0, 'marges');
print "<br>"; print "<br>";

12
htdocs/comm/propal/class/propal.class.php
View File

@ -303,6 +303,8 @@ class Propal extends CommonObject
* @param int $rang Position of line * @param int $rang Position of line
* @param int $special_code Special code * @param int $special_code Special code
* @param int $fk_parent_line Id of parent line * @param int $fk_parent_line Id of parent line
* @param int $fk_fournprice Id supplier price
* @param int $pa_ht Buying price without tax
* @return int >0 if OK, <0 if KO * @return int >0 if OK, <0 if KO
* *
* @see add_product * @see add_product
@ -456,13 +458,15 @@ class Propal extends CommonObject
* @param int $special_code Set special code ('' = we don't change it) * @param int $special_code Set special code ('' = we don't change it)
* @param int $fk_parent_line Id of line parent * @param int $fk_parent_line Id of line parent
* @param int $skip_update_total Skip update total * @param int $skip_update_total Skip update total
* @param int $fk_fournprice Id supplier price
* @param int $pa_ht Buying price without tax
* @return int 0 if OK, <0 if KO * @return int 0 if OK, <0 if KO
*/ */
function updateline($rowid, $pu, $qty, $remise_percent=0, $txtva, $txlocaltax1=0, $txlocaltax2=0, $desc='', $price_base_type='HT', $info_bits=0, $special_code=0, $fk_parent_line=0, $skip_update_total=0, $fk_fournprice=null, $pa_ht = 0) function updateline($rowid, $pu, $qty, $remise_percent, $txtva, $txlocaltax1=0, $txlocaltax2=0, $desc='', $price_base_type='HT', $info_bits=0, $special_code=0, $fk_parent_line=0, $skip_update_total=0, $fk_fournprice=null, $pa_ht=0)
{ {
global $conf,$user,$langs; global $conf,$user,$langs;
dol_syslog("Propal::UpdateLine $rowid, $pu, $qty, $remise_percent, $txtva, $desc, $price_base_type, $info_bits"); dol_syslog(get_class($this)."::updateLine $rowid, $pu, $qty, $remise_percent, $txtva, $desc, $price_base_type, $info_bits");
include_once(DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'); include_once(DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php');
// Clean parameters // Clean parameters
@ -750,8 +754,8 @@ class Propal extends CommonObject
$this->lines[$i]->rang, $this->lines[$i]->rang,
$this->lines[$i]->special_code, $this->lines[$i]->special_code,
$fk_parent_line, $fk_parent_line,
$this->lines[$i]->fk_fournprice, $this->lines[$i]->fk_fournprice,
$this->lines[$i]->pa_ht $this->lines[$i]->pa_ht
); );
if ($result < 0) if ($result < 0)

12
htdocs/commande/class/commande.class.php
View File

@ -697,8 +697,8 @@ class Commande extends CommonOrder
$this->lines[$i]->rang, $this->lines[$i]->rang,
$this->lines[$i]->special_code, $this->lines[$i]->special_code,
$fk_parent_line, $fk_parent_line,
$this->lines[$i]->fk_fournprice, $this->lines[$i]->fk_fournprice,
$this->lines[$i]->pa_ht $this->lines[$i]->pa_ht
); );
if ($result < 0) if ($result < 0)
{ {
@ -996,6 +996,8 @@ class Commande extends CommonOrder
* @param int $rang Position of line * @param int $rang Position of line
* @param int $special_code Special code * @param int $special_code Special code
* @param int $fk_parent_line Parent line * @param int $fk_parent_line Parent line
* @param int $fk_fournprice Id supplier price
* @param int $pa_ht Buying price (without tax)
* @return int >0 if OK, <0 if KO * @return int >0 if OK, <0 if KO
* *
* @see add_product * @see add_product
@ -1005,7 +1007,7 @@ class Commande extends CommonOrder
* par l'appelant par la methode get_default_tva(societe_vendeuse,societe_acheteuse,produit) * par l'appelant par la methode get_default_tva(societe_vendeuse,societe_acheteuse,produit)
* et le desc doit deja avoir la bonne valeur (a l'appelant de gerer le multilangue) * et le desc doit deja avoir la bonne valeur (a l'appelant de gerer le multilangue)
*/ */
function addline($commandeid, $desc, $pu_ht, $qty, $txtva, $txlocaltax1=0, $txlocaltax2=0, $fk_product=0, $remise_percent=0, $info_bits=0, $fk_remise_except=0, $price_base_type='HT', $pu_ttc=0, $date_start='', $date_end='', $type=0, $rang=-1, $special_code=0, $fk_parent_line=0, $fk_fournprice=null, $pa_ht = 0) function addline($commandeid, $desc, $pu_ht, $qty, $txtva, $txlocaltax1=0, $txlocaltax2=0, $fk_product=0, $remise_percent=0, $info_bits=0, $fk_remise_except=0, $price_base_type='HT', $pu_ttc=0, $date_start='', $date_end='', $type=0, $rang=-1, $special_code=0, $fk_parent_line=0, $fk_fournprice=null, $pa_ht=0)
{ {
dol_syslog("Commande::addline commandeid=$commandeid, desc=$desc, pu_ht=$pu_ht, qty=$qty, txtva=$txtva, fk_product=$fk_product, remise_percent=$remise_percent, info_bits=$info_bits, fk_remise_except=$fk_remise_except, price_base_type=$price_base_type, pu_ttc=$pu_ttc, date_start=$date_start, date_end=$date_end, type=$type", LOG_DEBUG); dol_syslog("Commande::addline commandeid=$commandeid, desc=$desc, pu_ht=$pu_ht, qty=$qty, txtva=$txtva, fk_product=$fk_product, remise_percent=$remise_percent, info_bits=$info_bits, fk_remise_except=$fk_remise_except, price_base_type=$price_base_type, pu_ttc=$pu_ttc, date_start=$date_start, date_end=$date_end, type=$type", LOG_DEBUG);
@ -2151,9 +2153,11 @@ class Commande extends CommonOrder
* @param int $type Type of line (0=product, 1=service) * @param int $type Type of line (0=product, 1=service)
* @param int $fk_parent_line Parent line id * @param int $fk_parent_line Parent line id
* @param int $skip_update_total Skip update of total * @param int $skip_update_total Skip update of total
* @param int $fk_fournprice Id supplier price
* @param int $pa_ht Buying price (without tax)
* @return int < 0 if KO, > 0 if OK * @return int < 0 if KO, > 0 if OK
*/ */
function updateline($rowid, $desc, $pu, $qty, $remise_percent=0, $txtva, $txlocaltax1=0,$txlocaltax2=0, $price_base_type='HT', $info_bits=0, $date_start='', $date_end='', $type=0, $fk_parent_line=0, $skip_update_total=0, $fk_fournprice=null, $pa_ht = 0) function updateline($rowid, $desc, $pu, $qty, $remise_percent, $txtva, $txlocaltax1=0,$txlocaltax2=0, $price_base_type='HT', $info_bits=0, $date_start='', $date_end='', $type=0, $fk_parent_line=0, $skip_update_total=0, $fk_fournprice=null, $pa_ht=0)
{ {
global $conf; global $conf;

3
htdocs/commissions/lib/commissions.lib.php
View File

@ -23,6 +23,7 @@
/** /**
* Define head array for tabs of marges tools setup pages * Define head array for tabs of marges tools setup pages
*
* @return Array of head * @return Array of head
*/ */
function commissions_admin_prepare_head() function commissions_admin_prepare_head()
@ -46,4 +47,4 @@ function commissions_admin_prepare_head()
return $head; return $head;
} }
?> ?>

2
htdocs/core/modules/modCommande.class.php
View File

@ -33,7 +33,7 @@ include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php");
/** /**
* Classe de description et activation du module Commande * Class to describe module customer orders
*/ */
class modCommande extends DolibarrModules class modCommande extends DolibarrModules
{ {

23
htdocs/core/modules/modCommissions.class.php
View File

@ -27,8 +27,7 @@ include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php");
/** /**
* \class modCommissions * Class to describe modude Commisions
* \brief Description and activation class for module Commissions
*/ */
class modCommissions extends DolibarrModules class modCommissions extends DolibarrModules
{ {
@ -37,7 +36,7 @@ class modCommissions extends DolibarrModules
* *
* @param DoliDB $db Database handler * @param DoliDB $db Database handler
*/ */
function modCommissions($db) function __construct($db)
{ {
$this->db = $db; $this->db = $db;
@ -127,7 +126,7 @@ class modCommissions extends DolibarrModules
* The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database. * The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
* It also creates data directories. * It also creates data directories.
* *
* @return int 1 if OK, 0 if KO * @return int 1 if OK, 0 if KO
*/ */
function init() function init()
{ {
@ -140,10 +139,10 @@ class modCommissions extends DolibarrModules
/** /**
* Function called when module is disabled. * Function called when module is disabled.
* Remove from database constants, boxes and permissions from Dolibarr database. * Remove from database constants, boxes and permissions from Dolibarr database.
* Data directories are not deleted. * Data directories are not deleted.
* *
* @return int 1 if OK, 0 if KO * @return int 1 if OK, 0 if KO
*/ */
function remove() function remove()
{ {
@ -154,14 +153,14 @@ class modCommissions extends DolibarrModules
/** /**
* Create tables and keys required by module * Create tables and keys required by module
* Files mymodule.sql and mymodule.key.sql with create table and create keys * Files mymodule.sql and mymodule.key.sql with create table and create keys
* commands must be stored in directory /mymodule/sql/ * commands must be stored in directory /mymodule/sql/
* This function is called by this->init. * This function is called by this->init.
* *
* @return int <=0 if KO, >0 if OK * @return int <=0 if KO, >0 if OK
*/ */
function load_tables() function load_tables()
{ {
return; return;
} }

3
htdocs/core/modules/modMargin.class.php
View File

@ -25,8 +25,7 @@ include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php");
/** /**
* \class modMargin * Class to describe module Margin
* \brief Description and activation class for module Margin
*/ */
class modMargin extends DolibarrModules class modMargin extends DolibarrModules
{ {