Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-12 04:21:30 +01:00
Code Issues Packages Projects Releases Wiki Activity
56,031 Commits 36 Branches 190 Tags
b51b6fa8c8870e0ec19997ba14db33c764f27293
Commit Graph

10237 Commits

Author SHA1 Message Date
Laurent Destailleur
034b08ce56 NEW Add option "Hide images in Top menu". 2016-08-05 23:40:00 +02:00
Laurent Destailleur
bcd055b378 Move button to link to, in same part of code than code to output links. 2016-08-05 15:30:28 +02:00
Laurent Destailleur
0e3ec5df38 Merge branch 'remove-mysql-driver' of 
https://github.com/marcosgdf/dolibarr into marcosgdf-remove-mysql-driver

Conflicts:
	htdocs/core/db/mysql.class.php
 2016-08-05 13:12:43 +02:00
Laurent Destailleur
890e6f59c8 NEW Support mass actions for proposals 2016-08-05 13:08:23 +02:00
Laurent Destailleur
e168888c59 NEW Reduce nb of picto on ref into list, merging preview and download 2016-08-05 12:20:11 +02:00
Laurent Destailleur
4cf01bc685 Fix code comment 2016-08-05 04:48:30 +02:00
Laurent Destailleur
e1e8254bcf Fix thumbs are using same extension than original. 2016-08-05 04:31:19 +02:00
Laurent Destailleur
544d5af49b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-08-05 01:15:35 +02:00
Laurent Destailleur
33d12a4492 Merge remote-tracking branch 'origin/4.0' into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/langs/en_US/admin.lang
 2016-08-05 01:15:19 +02:00
Laurent Destailleur
7211542e41 Merge pull request #5569 from olsesacl/develop-show-preview-documents 
NEW Preview documents
 2016-08-05 01:13:35 +02:00
Laurent Destailleur
c73f962b28 Merge pull request #5585 from atm-florian/dev_NEW_workflow_ClassPropalBillOnBillValidation 
NEW : Add workflow to classifed propal bill on invoice validation
 2016-08-05 00:46:12 +02:00
Laurent Destailleur
4e483c675e Merge branch 'dev_add_color_on_select_product' of 
https://github.com/atm-florian/dolibarr into
atm-florian-dev_add_color_on_select_product

Conflicts:
	htdocs/core/class/html.form.class.php
 2016-08-05 00:44:24 +02:00
Laurent Destailleur
782ab6a02b Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 
Conflicts:
	htdocs/core/modules/barcode/modules_barcode.class.php
	htdocs/product/admin/product.php
 2016-08-05 00:42:40 +02:00
Laurent Destailleur
9349f27742 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-08-04 17:10:02 +02:00
Laurent Destailleur
5126786d60 NEW Add option SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED 2016-08-04 15:48:34 +02:00
Laurent Destailleur
d688681605 Use standard prefix for supplier order for new install 2016-08-04 15:45:55 +02:00
Laurent Destailleur
26f553a1a8 Fix bad position of test 2016-08-04 12:04:43 +02:00
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