Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5

Browse Source 
Conflicts:
	ChangeLog
This commit is contained in:
Laurent Destailleur
2015-08-13 00:06:27 +02:00
parent a8c2dfd445 d3f004d407
commit 4b51fc80a6
4 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -3,7 +3,7 @@ English Dolibarr ChangeLog
-------------------------------------------------------------- --------------------------------------------------------------
***** ChangeLog for 3.5.7 compared to 3.5.6 ***** ***** ChangeLog for 3.5.7 compared to 3.5.6 *****
Fix: Paypal link were broken dur to SSL v3 closed. Fix: Paypal link were broken due to SSL v3 closed.
Fix: [ bug #1769 ] Error when installing to a PostgreSQL DB that contains numbers Fix: [ bug #1769 ] Error when installing to a PostgreSQL DB that contains numbers
Fix: [ bug #1752 ] Date filter of margins module, filters since 12H instead of 00H Fix: [ bug #1752 ] Date filter of margins module, filters since 12H instead of 00H
Fix: [ bug #1757 ] Sorting breaks product/service statistics Fix: [ bug #1757 ] Sorting breaks product/service statistics
@@ -28,6 +28,7 @@ Fix: [ bug #3268 ] SQL error when accessing thirdparty log page without a socid
Fix: [ bug #3180 ] formObjectOptions hook when editing thirdparty card does not print result Fix: [ bug #3180 ] formObjectOptions hook when editing thirdparty card does not print result
Fix: [ bug #1791 ] Margin menu not available if any Finance module is not enabled Fix: [ bug #1791 ] Margin menu not available if any Finance module is not enabled
Fix: [ bug #3310 ] OrderLine::fetch, FactureLigne::fetch and PropaleLigne::fetch do not return anything Fix: [ bug #3310 ] OrderLine::fetch, FactureLigne::fetch and PropaleLigne::fetch do not return anything
Fix: [ bug #3206 ] PropaleLigne, OrderLine and FactureLigne given to triggers through update function does not contain all the information
***** ChangeLog for 3.5.6 compared to 3.5.5 ***** ***** ChangeLog for 3.5.6 compared to 3.5.5 *****
Fix: Avoid missing class error for fetch_thirdparty method #1973 Fix: Avoid missing class error for fetch_thirdparty method #1973

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

@@ -528,13 +528,14 @@ class Propal extends CommonObject
$price = $pu - $remise; $price = $pu - $remise;
} }
// Update line //Fetch current line from the database and then clone the object and set it in $oldline property
$this->line=new PropaleLigne($this->db); $line = new PropaleLigne($this->db);
$line->fetch($rowid);
// Stock previous line records $staticline = clone $line;
$staticline=new PropaleLigne($this->db);
$staticline->fetch($rowid); $line->oldline = $staticline;
$this->line->oldline = $staticline; $this->line = $line;
// Reorder if fk_parent_line change // Reorder if fk_parent_line change
if (! empty($fk_parent_line) && ! empty($staticline->fk_parent_line) && $fk_parent_line != $staticline->fk_parent_line) if (! empty($fk_parent_line) && ! empty($staticline->fk_parent_line) && $fk_parent_line != $staticline->fk_parent_line)

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

@@ -2349,13 +2349,14 @@ class Commande extends CommonOrder
$price = ($pu - $remise); $price = ($pu - $remise);
} }
// Update line //Fetch current line from the database and then clone the object and set it in $oldline property
$this->line=new OrderLine($this->db); $line = new OrderLine($this->db);
$line->fetch($rowid);
// Stock previous line records $staticline = clone $line;
$staticline=new OrderLine($this->db);
$staticline->fetch($rowid); $line->oldline = $staticline;
$this->line->oldline = $staticline; $this->line = $line;
// Reorder if fk_parent_line change // Reorder if fk_parent_line change
if (! empty($fk_parent_line) && ! empty($staticline->fk_parent_line) && $fk_parent_line != $staticline->fk_parent_line) if (! empty($fk_parent_line) && ! empty($staticline->fk_parent_line) && $fk_parent_line != $staticline->fk_parent_line)

13
htdocs/compta/facture/class/facture.class.php
View File

@@ -2224,13 +2224,14 @@ class Facture extends CommonInvoice
} }
$price = price2num($price); $price = price2num($price);
// Update line into database //Fetch current line from the database and then clone the object and set it in $oldline property
$this->line=new FactureLigne($this->db); $line = new FactureLigne($this->db);
$line->fetch($rowid);
// Stock previous line records $staticline = clone $line;
$staticline=new FactureLigne($this->db);
$staticline->fetch($rowid); $line->oldline = $staticline;
$this->line->oldline = $staticline; $this->line = $line;
// Reorder if fk_parent_line change // Reorder if fk_parent_line change
if (! empty($fk_parent_line) && ! empty($staticline->fk_parent_line) && $fk_parent_line != $staticline->fk_parent_line) if (! empty($fk_parent_line) && ! empty($staticline->fk_parent_line) && $fk_parent_line != $staticline->fk_parent_line)