lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
77,693 Commits 43 Branches 150 Tags 886 MiB
89447acaf3
Commit Graph

4693 Commits

Author SHA1 Message Date
Laurent Destailleur
3351a1687c Fix phpcs 2019-08-10 02:17:07 +02:00
Laurent Destailleur
8647a20c18 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/langs/en_US/admin.lang
	htdocs/product/dynamic_price/class/price_parser.class.php
	htdocs/product/stats/facture.php
 2019-08-10 01:57:43 +02:00
Laurent Destailleur
2824dee11a Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/langs/en_US/admin.lang
	htdocs/product/dynamic_price/class/price_parser.class.php
 2019-08-10 01:20:17 +02:00
Laurent Destailleur
6a8910f109
Merge pull request #11649 from ptibogxiv/patch-216 
FIX qty in invoice list on product's stats
 2019-08-10 00:37:35 +02:00
Je2fb
2dee289fc6 Update price_parser.class.php 
Calculation with supplier_min_price work

Conflicts:
	htdocs/product/dynamic_price/class/price_parser.class.php
 2019-08-10 00:21:13 +02:00
Laurent Destailleur
88c66d24fe
Merge pull request #11662 from ptibogxiv/patch-219 
FIX duration when creating service
 2019-08-09 23:53:55 +02:00
Laurent Destailleur
6d4ba6b36b
Merge branch 'develop' into develop 2019-08-09 23:49:31 +02:00
Regis Houssin
0b831ccdf7 FIX better help message with multicompany 2019-08-09 09:33:14 +02:00
Je2fb
1a592f8f69
Update price_parser.class.php 2019-08-08 09:34:59 +02:00
Je2fb
4008ddc567
Update price_parser.class.php 2019-08-08 09:33:03 +02:00
ptibogxiv
322ec32ff5
FIX duration when creating service 2019-08-07 20:16:53 +02:00
Je2fb
ef285a87a8
Update price_parser.class.php 
Calculation with supplier_min_price work
 2019-08-07 17:16:34 +02:00
ptibogxiv
0fc92b92a2
Update facture.php 2019-08-06 16:47:54 +02:00
ptibogxiv
ee8d99351d
Update facture.php 2019-08-06 16:28:18 +02:00
Frédéric FRANCE
69985339d8
Update price_parser.class.php 2019-08-06 11:47:34 +02:00
Laurent Destailleur
a46bfc7a29 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/project.lib.php
 2019-07-25 17:54:14 +02:00
Alexandre SPANGARO
323d2df210 Presentation nowrap on amount 2019-07-24 10:42:00 +02:00
Laurent Destailleur
50480bf517 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/opensurvey/index.php
 2019-07-18 18:23:24 +02:00
Laurent Destailleur
fb5af65f4d FIX #11466 2019-07-15 23:56:05 +02:00
Laurent Destailleur
adfbd62f8b Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-14 00:44:35 +02:00
Laurent Destailleur
694be619b2 Fix doxygen 2019-07-11 22:16:32 +02:00
Laurent Destailleur
f5cc29417d Translation lignes -> lines 2019-07-05 21:50:35 +02:00
Laurent Destailleur
0a7d70829f Translation of some comments 2019-07-05 21:37:25 +02:00
Laurent Destailleur
2fee41f712 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-04 12:27:00 +02:00
Laurent Destailleur
8e3620fce1 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/compta/facture/invoicetemplate_list.php
 2019-07-04 12:26:17 +02:00
Laurent Destailleur
80bbc2577e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-04 12:09:26 +02:00
Laurent Destailleur
b065cbc6f8 FIX #11446 2019-07-04 12:09:04 +02:00
Laurent Destailleur
3d0a5d9f00
Merge pull request #11442 from atm-john/9.0_Fix_column_price_display 
Fix column price display
 2019-07-04 10:50:35 +02:00
John Botella
0288338364 Fix column price display 2019-07-02 14:38:09 +02:00
atm-quentin
8cdb251ca5 FIX product_use_units was set to 0 each time a conf in block other was set 2019-07-02 10:18:03 +02:00
Laurent Destailleur
b177787f0a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
	htdocs/product/class/product.class.php
 2019-06-29 18:28:51 +02:00
Laurent Destailleur
adb3062a9f Work on nblignes -> nblines 2019-06-29 16:38:14 +02:00
Laurent Destailleur
93b0e45246 Fix duplicate class in some cases 2019-06-29 02:27:58 +02:00
Laurent Destailleur
d71330c00b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-29 02:04:16 +02:00
Laurent Destailleur
36e240a16d NEW Add statistics on product into contracts 2019-06-29 02:03:57 +02:00
Laurent Destailleur
8aebcc45b2 Fix message to not show sometimes 2019-06-29 01:54:38 +02:00
Laurent Destailleur
97827f5172 Fix print 2019-06-29 01:44:49 +02:00
Laurent Destailleur
1b33952028
Update facture.php 2019-06-28 12:37:22 +02:00
ptibogxiv
55bd67058b
Update facture.php 2019-06-26 14:10:52 +02:00
atm-quentin
7f62fdbfe4 FIX buyprice barcode default val 2019-06-25 14:27:44 +02:00
atm-quentin
4b3824a1a9 FIX buyprice barcode default val 2019-06-25 14:17:31 +02:00
Laurent Destailleur
fa476b4994 Properties ->libelle_incoterms were renamed into ->label_incoterms 2019-06-25 13:00:02 +02:00
Laurent Destailleur
3ca258c93d Remove dead code 2019-06-24 22:58:21 +02:00
Laurent Destailleur
a7bd734ece Rename ->produit into ->product. Still permissions to rename. 2019-06-24 21:18:49 +02:00
Laurent Destailleur
efa09301b1 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-22 20:19:14 +02:00
Laurent Destailleur
b202c7eaa0 Fix confusion between ->childs and ->childsoncascade 2019-06-22 20:17:40 +02:00
Laurent Destailleur
5675e7c50e Clean code of deprecated method 2019-06-22 18:19:40 +02:00
Laurent Destailleur
b0c76f48e1 error management 2019-06-21 09:38:26 +02:00
Laurent Destailleur
8da5794777 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/accounting.lib.php
	htdocs/product/stock/class/entrepot.class.php
 2019-06-20 18:24:43 +02:00
Laurent Destailleur
e28bf71964 Fix error management of warehouse->delete 2019-06-20 18:15:14 +02:00