lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
55,090 Commits 43 Branches 150 Tags 886 MiB
d72d6de9f1
Commit Graph

55090 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
d72d6de9f1 git push origin developMerge branch 'atm-florian-dev_add_color_on_select_product' into develop 2016-08-05 00:44:35 +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
9349f27742 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-08-04 17:10:02 +02:00
Laurent Destailleur
4b5cae0af8 Fix help 2016-08-04 17:09:49 +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
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
a240cf30d6 Fix PROJECT_LINES_PERWEEK_SHOW_THIRDPARTY to show thirdparty. 2016-08-03 00:50:17 +02:00
Laurent Destailleur
eb546cb4d4 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 2016-08-02 18:18:39 +02:00
Laurent Destailleur
176b52f305 Fix No modify trigger must be called during creation 2016-08-02 17:55:13 +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
Laurent Destailleur
d353a7863b Fix ambiguos field 2016-08-02 17:39:23 +02:00
Laurent Destailleur
3ea7a1fcab Fix strict mode 2016-08-02 17:36:24 +02:00
Laurent Destailleur
75b909ce93 Fix missing transaction in update_perso function 2016-08-02 16:55:32 +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
Laurent Destailleur
86f576f8d3 Fix strict sql 2016-08-02 13:45:35 +02:00
Laurent Destailleur
54df49aebe Fix strict sql 2016-08-02 13:36:16 +02:00
Laurent Destailleur
fdfe333f69 Fix strict sql 2016-08-02 13:10:09 +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
dfc38351ef Fix $i not initialized 2016-08-01 19:48:39 +02:00
Laurent Destailleur
a35dd9f2d1 Fix bad separation of address 2016-08-01 19:37:17 +02:00
Laurent Destailleur
5eda10e0dd Fix link 2016-08-01 16:04:49 +02:00
Laurent Destailleur
a02c539a82 FIX #5521 2016-08-01 15:53:51 +02:00
Laurent Destailleur
1e90d0a54c Fix path using https 2016-08-01 15:22:48 +02:00
Laurent Destailleur
91e9204985 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 2016-08-01 15:20:48 +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
4410057106 Fix typo 2016-08-01 15:18:52 +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
bb99209b5e Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-08-01 15:06:22 +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
58c18f438c Move changelog at correct place 2016-08-01 15:02:23 +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
BENKE Charlie
9a0494bd64 Update bonprelevement.class.php 2016-08-01 14:11:58 +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
417dd6465c Merge pull request #5570 from aspangaro/4.0-p36 
Fix Presentation & uniformize code
 2016-08-01 13:39:54 +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
Laurent Destailleur
e0c232548e Fix theme crazy after migration 2016-08-01 10:55:41 +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
aspangaro
8ce5fcd980 Uniformize presentation salary payment 2016-08-01 07:40:05 +02:00
aspangaro
0b7a5a4af9 Uniformize presentation donation 2016-08-01 07:34:55 +02:00
aspangaro
4a0eb496fa Merge remote-tracking branch 'Upstream/4.0' into 4.0-p36 
Conflicts:
	htdocs/societe/rib.php
 2016-08-01 07:27:49 +02:00
aspangaro
4ee4de4a00 Uniformize presentation supplier invoice 2016-08-01 07:21:24 +02:00