Commit Graph

76209 Commits

Author SHA1 Message Date
Laurent Destailleur
2ae3d75df4
Merge pull request #10752 from atm-gauthier/7.0_fix_fourninvoice_specialcode
FIX : we need to keep originline special_code
2019-03-07 12:29:00 +01:00
Laurent Destailleur
e3fb228a4d
Update fournisseur.facture.class.php 2019-03-07 12:28:19 +01:00
Laurent Destailleur
f54eb78260 NEW Show the latest date of subscription in member statistics reports 2019-03-07 12:22:24 +01:00
John BOTELLA
ca10b1e403 add new dolGetStatus to LibStatut in product class 2019-03-07 11:37:54 +01:00
Christophe Battarel
a6bb1cf5f6 avoid timeout 2019-03-07 11:27:06 +01:00
Christophe Battarel
1b26f1fa08 remove avoid timeout 2019-03-07 11:26:21 +01:00
Christophe Battarel
5a98207998 avoid timeout 2019-03-07 11:19:55 +01:00
Laurent Destailleur
a426c8e9bf Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/system/filecheck.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/filefunc.inc.php
	htdocs/install/upgrade2.php
	htdocs/product/class/product.class.php
2019-03-07 11:16:24 +01:00
Laurent Destailleur
e67890bd22 NEW Can enter price with or without tax when entering expense repor line 2019-03-07 11:09:04 +01:00
Laurent Destailleur
96d4e28473 FIX Vat src code lost after editing expense report line 2019-03-07 11:08:01 +01:00
Laurent Destailleur
2cd09aaf09 Prepare version 9.0.2 2019-03-07 10:57:15 +01:00
Laurent Destailleur
c513116717 FIX missing vat_src_code when inserting an expense report line 2019-03-07 10:56:48 +01:00
John BOTELLA
5ea5d51247 Merge branch 'theme_top_menu' of github.com:atm-john/dolibarr into theme_badge_status 2019-03-07 09:41:03 +01:00
John BOTELLA
89157234b7 Merge branch 'develop' of github.com:Dolibarr/dolibarr into theme_top_menu 2019-03-07 09:33:11 +01:00
Timoté Fallais
c31318f29d Update libelle of user (making Mailman working correctly) 2019-03-07 09:15:43 +01:00
Christophe Battarel
96b8da0d62 fix supllier discount 2019-03-06 22:04:01 +01:00
Laurent Destailleur
b15e00cae7 FIX Autodetect buy price for invoices autogenerated with templates. 2019-03-06 21:39:09 +01:00
Laurent Destailleur
6206402be3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-03-06 20:51:44 +01:00
Laurent Destailleur
1b0aec0847 Complete fields for template invoices 2019-03-06 20:51:07 +01:00
Frédéric FRANCE
d39b600ff4
Update CMailFile.class.php 2019-03-06 20:29:58 +01:00
Laurent Destailleur
31c296f44b Fix bad tooltip to rm file 2019-03-06 20:01:21 +01:00
Laurent Destailleur
ddc3478156 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-03-06 19:14:15 +01:00
Laurent Destailleur
e163849d05 Fix label 2019-03-06 19:13:59 +01:00
Frédéric FRANCE
7b09562976
Update bom_card.php 2019-03-06 19:05:13 +01:00
Frédéric FRANCE
edf9913c20
Update bom_list.php 2019-03-06 19:00:12 +01:00
Frédéric FRANCE
9e6a5a0b81
Update eldy.lib.php 2019-03-06 18:49:03 +01:00
Frédéric FRANCE
2185f129cd
syntax error 2019-03-06 18:44:03 +01:00
Frédéric FRANCE
e57a674939
Update setup.php 2019-03-06 18:36:48 +01:00
Frédéric FRANCE
02d4a234b7
Update bom.lib.php 2019-03-06 18:30:34 +01:00
Frédéric FRANCE
cf00b2a2df
Update bom_note.php 2019-03-06 18:26:23 +01:00
Frédéric FRANCE
e4de89e3eb
Update bom_list.php 2019-03-06 18:25:02 +01:00
Frédéric FRANCE
6067994119
Update bom_document.php 2019-03-06 18:23:25 +01:00
Frédéric FRANCE
8246c79b15
Update bom_card.php 2019-03-06 18:20:44 +01:00
Laurent Destailleur
60a02bc241
Merge pull request #10757 from frederic34/patch-3
phpcs fix
2019-03-06 18:11:07 +01:00
Laurent Destailleur
9ffac1ca4a
Merge pull request #10750 from altatof/themefix
FIX : allow eldy theme stylesheet to be included in custom themes
2019-03-06 18:10:41 +01:00
Laurent Destailleur
401ad65975 Fix API explorer was broken due to corrupted API 2019-03-06 18:04:36 +01:00
Frédéric FRANCE
8743b43fdb
add oldcopy of category before updating 2019-03-06 18:01:18 +01:00
Christophe Battarel
414bac6fb4 avoid logging empty query 2019-03-06 17:56:43 +01:00
Christophe Battarel
8f8fe0648e fix bad copy paste 2019-03-06 17:24:50 +01:00
Christophe Battarel
4382a26c87 sort list of models alphabetically 2019-03-06 17:21:44 +01:00
Christophe Battarel
b4397806fc bad branching 2 2019-03-06 17:14:05 +01:00
Christophe Battarel
0f8f4fbc15 bad branching 2019-03-06 17:12:39 +01:00
Christophe Battarel
ceab55f26b NEW : add constant MAIN_DEFAULT_LANGUAGE_FILTER 2019-03-06 17:07:51 +01:00
Frédéric FRANCE
c2070190f2
phpcs fix 2019-03-06 16:51:35 +01:00
Christophe Battarel
a6b759bd87 remove specific entry in gitignore 2019-03-06 16:50:28 +01:00
Christophe Battarel
cb39c6f3ce remove specific entry in gitignore 2019-03-06 16:48:48 +01:00
Christophe Battarel
7a512d587c remove specific entry in gitignore 2019-03-06 16:44:06 +01:00
Christophe Battarel
4e533b2a91 better constant test 2019-03-06 16:41:28 +01:00
Christophe Battarel
d3bb9d2cc2 add contant DISPLAY_DISCOUNTED_SUPPLIER_PRICE 2019-03-06 16:37:02 +01:00
John BOTELLA
efed7ae6aa Fix tabs badges 2019-03-06 16:00:09 +01:00