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

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

Browse Source
This commit is contained in:
Florian HENRY 2014-07-12 19:06:39 +02:00
commit 13e434cf68
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/rpm/dolibarr_fedora.spec
View File

@ -331,7 +331,7 @@ fi
# version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release # version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release
%changelog %changelog
* Tue July 1 2014 Laurent Destailleur 3.5.4-0.3 * Tue Jul 1 2014 Laurent Destailleur 3.5.4-0.3
- Upstream release - Upstream release
* Fri May 2 2014 Laurent Destailleur 3.5.3-0.3 * Fri May 2 2014 Laurent Destailleur 3.5.3-0.3

2
build/rpm/dolibarr_generic.spec
View File

@ -567,7 +567,7 @@ fi
# version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release # version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release
%changelog %changelog
* Tue July 1 2014 Laurent Destailleur 3.5.4-0.3 * Tue Jul 1 2014 Laurent Destailleur 3.5.4-0.3
- Upstream release - Upstream release
* Fri May 2 2014 Laurent Destailleur 3.5.3-0.3 * Fri May 2 2014 Laurent Destailleur 3.5.3-0.3

2
build/rpm/dolibarr_mandriva.spec
View File

@ -336,7 +336,7 @@ fi
# version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release # version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release
%changelog %changelog
* Tue July 1 2014 Laurent Destailleur 3.5.4-0.3 * Tue Jul 1 2014 Laurent Destailleur 3.5.4-0.3
- Upstream release - Upstream release
* Fri May 2 2014 Laurent Destailleur 3.5.3-0.3 * Fri May 2 2014 Laurent Destailleur 3.5.3-0.3

2
build/rpm/dolibarr_opensuse.spec
View File

@ -347,7 +347,7 @@ fi
# version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release # version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release
%changelog %changelog
* Tue July 1 2014 Laurent Destailleur 3.5.4-0.3 * Tue Jul 1 2014 Laurent Destailleur 3.5.4-0.3
- Upstream release - Upstream release
* Fri May 2 2014 Laurent Destailleur 3.5.3-0.3 * Fri May 2 2014 Laurent Destailleur 3.5.3-0.3

2
htdocs/commande/orderstoinvoice.php
View File

@ -285,7 +285,7 @@ if (($action == 'create' || $action == 'add') && empty($mesgs))
'HT', 'HT',
0, 0,
$product_type, $product_type,
$lines[$i]->rang, $ii,
$lines[$i]->special_code, $lines[$i]->special_code,
$object->origin, $object->origin,
$lines[$i]->rowid, $lines[$i]->rowid,