lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
67,866 Commits 43 Branches 150 Tags 886 MiB
7ca45cd117
Commit Graph

3667 Commits

Author SHA1 Message Date
Regis Houssin
e8afd7e833 Fix: use "supplier" instead "reseller" 2018-07-07 08:48:26 +02:00
Regis Houssin
1522a5b22d Fix: differentiate customer prices from supplier prices sharing 2018-07-07 08:43:59 +02:00
Laurent Destailleur
3ea2d81279 FIX combo into popup become crazy with IE10 2018-06-28 12:05:02 +02:00
Laurent Destailleur
55d5d01cfe FIX combo of stock in popup are crazy in IE 2018-06-28 11:53:52 +02:00
Philippe GRAND
1bb91c7860 update and clean code 2018-06-24 16:20:27 +02:00
Laurent Destailleur
af9d2c3b5a
Merge pull request #9008 from grandoc/new_branch_22_06_2018 
clean and update code
 2018-06-24 13:47:26 +02:00
Laurent Destailleur
0170906524 Look and feel 2018-06-23 14:39:24 +02:00
Laurent Destailleur
27a27e02a1 Fix css 2018-06-22 22:53:53 +02:00
Philippe GRAND
afda5288a8 clean and update code 2018-06-22 16:27:11 +02:00
Laurent Destailleur
07c514b85c Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/class/fournisseur.product.class.php
	htdocs/projet/class/projectstats.class.php
 2018-06-20 21:56:10 +02:00
Laurent Destailleur
9f2437fa04 Fix missing field 2018-06-20 17:59:01 +02:00
Laurent Destailleur
9d048281dc
Merge pull request #8970 from inoveaconseil/FixParamGenerateDocument 
Fix missing params on generateDocument
 2018-06-18 11:14:49 +02:00
Laurent Destailleur
187127ce6f Fix CSS 2018-06-16 21:19:50 +02:00
Laurent Destailleur
8c748505db Use parent instead of parents 2018-06-16 17:25:16 +02:00
Laurent Destailleur
7ad086bbdf FIX Duplicate select2 when we split a supplier order receipt item 2018-06-16 17:18:17 +02:00
Laurent Destailleur
5524784421 FIX prefilled date of order must have hours too 2018-06-16 15:24:31 +02:00
Laurent Destailleur
7981bd08b7 Fix price+sql error when adding product when no supplier price defined 2018-06-16 14:47:33 +02:00
Laurent Destailleur
4898f10fa2 FIX Adding a product with no supplier price defined yet 2018-06-16 13:49:28 +02:00
Inovea Conseil
d5a3e63e05 Fix missing paramater for generateDocument 2018-06-15 09:47:28 +02:00
Marc de Lima Lucio
1dec4c4320 FIX: supplier order: product supplier ref not saved on addline 2018-06-14 10:37:40 +02:00
Laurent Destailleur
910652eb6d Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/commande/card.php
	htdocs/langs/en_US/admin.lang
 2018-06-13 23:07:30 +02:00
Laurent Destailleur
4c2af6fc70 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/core/class/html.form.class.php
 2018-06-13 23:04:08 +02:00
Laurent Destailleur
4a5fd35e11 Look and feel v8 2018-06-13 22:57:41 +02:00
Laurent Destailleur
fdc90da408
Update card.php 2018-06-13 20:02:38 +02:00
altatof
d42f00bca9 FIX : pu_ht_devise was not converted to numeric so decimals were lost 
when clculating total_ht_devise
 2018-06-13 16:35:52 +02:00
florian HENRY
8031ef49f2 fix error return 2018-06-05 20:38:55 +02:00
Laurent Destailleur
d8d4d15b4b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-05-30 12:13:40 +02:00
Laurent Destailleur
de59892438 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/functions.lib.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2018-05-30 12:13:18 +02:00
Laurent Destailleur
0412264418 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
 2018-05-30 12:05:54 +02:00
Laurent Destailleur
60321aabd8 Fix regression 2018-05-30 11:59:23 +02:00
Laurent Destailleur
c1f5c6becf
Merge pull request #8877 from frederic34/longlines 
soft limit length of lines to 500 chars
 2018-05-30 11:19:29 +02:00
Laurent Destailleur
3733169120 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/compta/recap-compta.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2018-05-30 11:09:53 +02:00
Laurent Destailleur
7590df85e6
Merge pull request #8887 from atm-florian/6.0 
add hook on balence pages
 2018-05-30 10:47:59 +02:00
Laurent Destailleur
e57ceab5de
Update fournisseur.commande.class.php 2018-05-30 10:45:06 +02:00
florian HENRY
b65b545e0f add hook on balence pages 2018-05-29 16:29:14 +02:00
ATM-Nicolas
6b0b975ffd FIX : Keep supplier proposal price for supplier order 2018-05-29 11:21:30 +02:00
Frédéric FRANCE
e2a557aadd
limit length of lines to 500 chars 2018-05-27 15:04:12 +02:00
Frédéric FRANCE
9cd7bb3f58
loadlangs 2018-05-26 16:03:19 +02:00
Laurent Destailleur
f58e0d3bcf Fix scrutinizer errors 2018-05-23 08:24:20 +02:00
Laurent Destailleur
dd53f414f8
Merge pull request #8788 from bugness-chl/develop 
Fix #8722 useless sql ORDER BY
 2018-05-18 11:16:08 +02:00
Laurent Destailleur
ef395fc36b Fix scrutinizer bugs 2018-05-16 15:23:52 +02:00
Chl
9b2f62791b Fix #8722 useless sql ORDER BY 2018-05-13 15:52:47 +02:00
Laurent Destailleur
9c68b81f59 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/accountancy/admin/account.php
	htdocs/projet/class/task.class.php
 2018-05-05 14:34:54 +02:00
atm-greg
942e2f40bf addline manage rank on its own if not provided 2018-05-02 17:07:27 +02:00
Laurent Destailleur
984ef37ff5 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-29 20:19:05 +02:00
Laurent Destailleur
9a345e99ef Fix syntax error 2018-04-29 20:14:57 +02:00
Laurent Destailleur
0cdfd6800a Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-29 20:11:47 +02:00
Laurent Destailleur
82a8513aed Standardize code 2018-04-29 19:52:14 +02:00
Laurent Destailleur
a80621471c Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/commande/card.php
 2018-04-27 12:42:18 +02:00
Laurent Destailleur
e5df7e206b
Merge pull request #8224 from atm-ph/fix_6.0_supplier_order_from_supplier_proposal 
Fix wrong price on supplier order line
 2018-04-27 12:20:49 +02:00