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

Merge remote-tracking branch 'origin/3.7' into develop

Browse Source 
Conflicts:
	dev/codesniffer/ruleset.xml
This commit is contained in:
Laurent Destailleur 2014-12-18 23:56:40 +01:00
commit c3ac607e4f
3 changed files with 41 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -194,6 +194,7 @@ Dolibarr better:
- Fix: [ bug #1595 ] Selected boolean extrafield in intervention creation page, does not save state - Fix: [ bug #1595 ] Selected boolean extrafield in intervention creation page, does not save state
- Fix: Show sender Country on PDF docs when sender Country <> receiver Country - Fix: Show sender Country on PDF docs when sender Country <> receiver Country
- Fix: [ bug #1624 ] Use lowest buying price for margin when selling with POS - Fix: [ bug #1624 ] Use lowest buying price for margin when selling with POS
- Fix: [ bug #1749 ] Undefined $mailchimp
***** ChangeLog for 3.6.1 compared to 3.6.* ***** ***** ChangeLog for 3.6.1 compared to 3.6.* *****
For users: For users:

41
dev/codesniffer/ruleset.xml
View File

@ -27,7 +27,10 @@
<rule ref="Generic.CodeAnalysis.EmptyStatement.DetectedIF"> <rule ref="Generic.CodeAnalysis.EmptyStatement.DetectedIF">
<severity>0</severity> <severity>0</severity>
</rule> </rule>
<rule ref="Generic.CodeAnalysis.EmptyStatement.DetectedELSE">
<severity>0</severity>
</rule>
<rule ref="Generic.CodeAnalysis.EmptyStatement.NotAllowed"> <rule ref="Generic.CodeAnalysis.EmptyStatement.NotAllowed">
<severity>0</severity> <severity>0</severity>
</rule> </rule>
@ -208,7 +211,41 @@
<rule ref="PEAR.Commenting.FunctionComment.Missing"> <rule ref="PEAR.Commenting.FunctionComment.Missing">
<severity>0</severity> <severity>0</severity>
</rule> </rule>
<rule ref="PEAR.Commenting.ClassComment.Missing@authorTag">
<severity>0</severity>
</rule>
<rule ref="PEAR.Commenting.ClassComment.Missing@categoryTag">
<severity>0</severity>
</rule>
<rule ref="PEAR.Commenting.ClassComment.Missing@licenseTag">
<severity>0</severity>
</rule>
<rule ref="PEAR.Commenting.ClassComment.Missing@linkTag">
<severity>0</severity>
</rule>
<rule ref="PEAR.Commenting.ClassComment.Missing@packageTag">
<severity>0</severity>
</rule>
<rule ref="PEAR.Commenting.FunctionComment.SpacingAfterParamType">
<severity>0</severity>
</rule>
<rule ref="PEAR.Commenting.FunctionComment.SpacingAfterParamName">
<severity>0</severity>
</rule>
<!-- TODO Remove this and fix reported errors -->
<rule ref="PEAR.Commenting.ClassComment.Missing">
<severity>0</severity>
</rule>
<rule ref="PEAR.Commenting.FunctionComment.MissingReturn">
<severity>0</severity>
</rule>
<rule ref="PEAR.Commenting.FunctionComment.ReturnNotRequired">
<severity>0</severity>
</rule>
<rule ref="PEAR.Commenting.FunctionComment.Missing">
<severity>0</severity>
</rule>
<!-- <!--
<rule ref="PEAR.Commenting.FileComment" /> <rule ref="PEAR.Commenting.FileComment" />
<rule ref="PEAR.Commenting.FileComment.WrongStyle"> <rule ref="PEAR.Commenting.FileComment.WrongStyle">

2
htdocs/projet/element.php
View File

@ -247,7 +247,7 @@ if ($action=="addelement")
$elementselectid = GETPOST("elementselect"); $elementselectid = GETPOST("elementselect");
$result=$project->update_element($tablename, $elementselectid); $result=$project->update_element($tablename, $elementselectid);
if ($result<0) { if ($result<0) {
setEventMessage($mailchimp->error,'errors'); setEventMessage($project->error,'errors');
} }
}elseif ($action == "unlink") { }elseif ($action == "unlink") {