Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
56,821 Commits 36 Branches 189 Tags
e83bb0f50c1b0b51a587a423183563f07f46a982
Commit Graph

10470 Commits

Author SHA1 Message Date
Laurent Destailleur
7a7e7b330f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-08-04 11:58:11 +02:00
Laurent Destailleur
7f6e2a277a NEW Link between objects can be done on both side and on all objects 2016-08-04 11:57:37 +02:00
Laurent Destailleur
e0b9496f9e Fix link sometimes fails because of id not defined 2016-08-04 10:44:17 +02:00
florian HENRY
f0622139ff NEW : Add workflow to classifed propal bill on invoice validation 2016-08-04 09:55:16 +02:00
florian HENRY
13f33ab9c7 syntax 2016-08-04 09:23:10 +02:00
florian HENRY
a013e84e0e NEW : Add color regarding stock even on ajax autocompleter product 
selector
 2016-08-04 09:21:04 +02:00
Laurent Destailleur
b97223edd7 Fix: link to link to objects not visible 2016-08-03 19:01:51 +02:00
Laurent Destailleur
6ae8d26a89 Fix max width on combo of tasks 2016-08-03 00:04:38 +02:00
Laurent Destailleur
f0c75388cb Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/class/api_commande.class.php
	htdocs/compta/facture/class/api_invoice.class.php
	htdocs/product/class/api_product.class.php
	htdocs/societe/class/api_contact.class.php
	htdocs/societe/class/api_thirdparty.class.php
 2016-08-02 17:43:12 +02:00
florian HENRY
5144f21c6c FIX php Strict 2016-08-02 15:36:00 +02:00
Laurent Destailleur
cc21909909 Fix dol_include_once could not work to get external url of a module 2016-08-02 14:33:46 +02:00
Sergio Sanchis Climent
5fe0d601da New: Preview documents 2016-08-02 03:35:22 +02:00
Laurent Destailleur
a353093ae7 NEW Phone formatting for Canada. Add dol_print_phone into phpunit tests 2016-08-01 20:18:31 +02:00
Laurent Destailleur
e335ce6f45 Fix bad var declared 2016-08-01 19:54:03 +02:00
Laurent Destailleur
a35dd9f2d1 Fix bad separation of address 2016-08-01 19:37:17 +02:00
Laurent Destailleur
a02c539a82 FIX #5521 2016-08-01 15:53:51 +02:00
Laurent Destailleur
4a1e263e68 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 2016-08-01 15:19:25 +02:00
Laurent Destailleur
b267402df6 Merge remote-tracking branch 'origin/4.0' into develop 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/main.lang
	htdocs/societe/rib.php
 2016-08-01 15:15:32 +02:00
Laurent Destailleur
97dd1f4bbb Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 
Conflicts:
	htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
	htdocs/filefunc.inc.php
 2016-08-01 15:03:59 +02:00
Laurent Destailleur
803fe68061 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/compta/facture.php
	htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
	htdocs/filefunc.inc.php
 2016-08-01 15:01:14 +02:00
Laurent Destailleur
b999c71768 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-08-01 14:20:54 +02:00
Laurent Destailleur
49258db58d NEW Option DOC_SHOW_FIRST_SALES_REP shows name of buyer or saler on PDF. 2016-08-01 14:20:41 +02:00
Laurent Destailleur
845792d9fc Merge pull request #5571 from defrance/patch-19 
fix : extrafield required & defaut value disabled
 2016-08-01 13:42:39 +02:00
Laurent Destailleur
edbd92ee3e NEW Option SUPPLIER_ORDER_SHOW_FIRST_SALES_REP shows name of buyer on PO 2016-08-01 11:16:22 +02:00
BENKE Charlie
ae8f64494d fix : extrafield required & defaut value disabled 
When type "separate" is selected, required & defaut value fields are disabled and we can't not enable it.
 2016-08-01 09:56:41 +02:00
Laurent Destailleur
5f0951dcda Fix for option MAIN_OPTIMIZEFORTEXTBROWSER 2016-07-31 13:20:40 +02:00
Laurent Destailleur
51e941b9b4 Fix for option MAIN_OPTIMIZEFORTEXTBROWSER 2016-07-31 13:07:55 +02:00
Laurent Destailleur
79222c732d Fix bad var 2016-07-31 02:56:08 +02:00
Laurent Destailleur
0414f09e48 Fix permissions 2016-07-30 21:09:30 +02:00
Laurent Destailleur
e5583f1544 Fix bad translation. Confusionbetween internal tranfert and bank 
tranfert for payements
 2016-07-30 17:28:18 +02:00
Laurent Destailleur
01ee2b14cf Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-07-30 15:49:49 +02:00
Laurent Destailleur
d60ac77ad3 NEW The autofill zip/town table option is on by default. 2016-07-30 15:49:39 +02:00
Laurent Destailleur
a6147ee73b Miscellaneous fixes 2016-07-30 14:49:29 +02:00
Laurent Destailleur
ceb6199e87 Fix default numbering module of customer code was not enabled. 2016-07-30 12:31:32 +02:00
Laurent Destailleur
7a72b9bb09 Use https links 2016-07-30 11:40:55 +02:00
Laurent Destailleur
45d354ad82 Fix variable names MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN... 2016-07-29 22:58:39 +02:00
Laurent Destailleur
eafaa6f4dd Fix doxygen 2016-07-29 17:30:33 +02:00
Laurent Destailleur
45e37c82cd FIX #5539 Merge remote-tracking branch 'origin/3.9' into 4.0 
Conflicts:
	htdocs/fourn/facture/list.php
 2016-07-29 16:29:31 +02:00
Laurent Destailleur
b85bb8c0f8 Merge remote-tracking branch 'origin/3.9' into 4.0 
Conflicts:
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
 2016-07-29 16:24:02 +02:00
Laurent Destailleur
b3cdb1f163 FIX tag for date rfc in odt substitution 2016-07-29 16:21:28 +02:00
Laurent Destailleur
27243069cb FIX #5535 bad dependency. 
Conflicts:
	htdocs/fourn/facture/list.php
 2016-07-29 15:19:04 +02:00
Sergio Sanchis Climent
2a4afb8195 FIX Notice: Trying to get property of non-object when update 3.9 -> 4.0 2016-07-29 15:13:12 +02:00
Laurent Destailleur
5d97ce038b Fix page break when using a large html footer. 2016-07-28 23:58:13 +02:00
Laurent Destailleur
74a9bbbf38 FIX private property can't be read when building pdf 2016-07-28 23:51:09 +02:00
Laurent Destailleur
9ca7f2cb66 Better support for option MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN (on by 
default).
 2016-07-28 19:02:23 +02:00
florian HENRY
7b72965315 FIX incoterms 2016-07-28 16:48:16 +02:00
florian HENRY
c13c15188b FIX: incoterms do not output into crabe invoice PDF 2016-07-28 16:44:08 +02:00
Laurent Destailleur
00118610bb A fix to make editinplace working better 2016-07-28 15:29:46 +02:00
Laurent Destailleur
4e3dd4c927 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 2016-07-28 14:38:22 +02:00
Laurent Destailleur
e8b5fc5d06 Fix css to add bold border must be forced only when not previously done 2016-07-28 14:37:36 +02:00