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

2030 Commits

Author SHA1 Message Date
Laurent Destailleur
74deb05527 Clean code. Use constant for status of supplier order process. 2017-10-07 13:04:31 +02:00
Laurent Destailleur
8104c97f77 Prepare 6.0.2 2017-10-07 11:53:26 +02:00
Laurent Destailleur
d2c4da5156 Update doc 2017-10-03 16:03:26 +02:00
Laurent Destailleur
938989d2e4 Update doc 2017-09-26 20:31:39 +02:00
Laurent Destailleur
934edd9f5a Merge branch 'develop' into 6.0-api 2017-09-24 22:01:07 +02:00
Laurent Destailleur
5e2cc05047 Prepare 6.0.1 2017-09-20 11:12:47 +02:00
Laurent Destailleur
ab5724e7ff Mutualize code for forms to send emails. Remove thousand line of code. 2017-09-17 17:12:14 +02:00
Regis Houssin
b9e0879847 NEW: Add hook addAdminLdapOptions and doAction in ldap admin page 
NEW: complete_head_from_modules() in ldap_prepare_head()
 2017-09-15 10:57:22 +02:00
Laurent Destailleur
eadfbfe2bd Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/lib/functions2.lib.php
 2017-09-13 20:57:53 +02:00
Laurent Destailleur
f2cd96b9c0 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	ChangeLog
	htdocs/adherents/class/adherent.class.php
	htdocs/core/lib/price.lib.php
	htdocs/filefunc.inc.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/supplier_proposal/list.php
 2017-09-13 20:55:22 +02:00
Laurent Destailleur
a158f5ab9d Doc 2017-09-04 12:01:51 +02:00
Laurent Destailleur
084ea049d8 Minor bugs 2017-09-03 16:07:21 +02:00
Laurent Destailleur
4b9f54e571 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/install/mysql/data/llx_accounting.sql
	htdocs/install/mysql/migration/5.0.0-6.0.0.sql
	htdocs/install/mysql/tables/llx_holiday_config.sql
 2017-09-01 17:34:57 +02:00
Laurent Destailleur
d88a75b666 Fix typo 2017-09-01 13:47:12 +02:00
Laurent Destailleur
c573df4f0e Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/user/card.php
 2017-08-26 22:33:56 +02:00
Laurent Destailleur
4052e15565 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/comm/action/card.php
 2017-08-26 21:58:29 +02:00
Laurent Destailleur
c8f323b706 Prepare 5.0.5 2017-08-26 21:55:34 +02:00
Laurent Destailleur
3e7ed752ea Add changelog 2017-08-26 11:55:30 +02:00
Laurent Destailleur
90afbcb034 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/bank.php
	htdocs/core/lib/functions.lib.php
 2017-08-23 17:02:53 +02:00
Laurent Destailleur
f3ef6448d7 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/admin/supplier_payment.php
	htdocs/core/lib/ajax.lib.php
	htdocs/don/admin/donation.php
	htdocs/product/admin/product.php
 2017-08-23 16:11:51 +02:00
Laurent Destailleur
4da49dfc2d FIX #7239 2017-08-23 15:02:38 +02:00
Laurent Destailleur
4f6363bff8 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-08-21 00:49:47 +02:00
Laurent Destailleur
5a0641a30e Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/compta/bank/bankentries.php
 2017-08-21 00:47:58 +02:00
Laurent Destailleur
b6a7ce6822 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-08-01 10:22:37 +02:00
Laurent Destailleur
612ab65b72 Fix by adding a MULTICOMPANY_BACKWARD_COMPATIBILITY option. 2017-07-31 06:01:05 +02:00
Laurent Destailleur
55a2e63c32 Revert "Fix include fails" 
This reverts commit bfb904557f.
 2017-07-28 12:07:05 +02:00
Laurent Destailleur
bfb904557f Fix include fails 2017-07-28 12:06:12 +02:00
Laurent Destailleur
6421ec3139 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/doleditor.class.php
 2017-07-23 19:27:40 +02:00
Laurent Destailleur
0963a649b7 Update doc 2017-07-22 23:49:28 +02:00
Laurent Destailleur
854a6ca3d5 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-07-22 16:40:45 +02:00
Laurent Destailleur
e36911360b Update changelog 2017-07-22 02:22:16 +02:00
Laurent Destailleur
522f21e528 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/public/websites/index.php
 2017-07-21 02:32:01 +02:00
Laurent Destailleur
78ebffe4f1 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/install/fileconf.php
 2017-06-25 02:31:38 +02:00
Laurent Destailleur
e6e8a014a3 Prepare 5.0.4 2017-06-24 21:39:01 +02:00
Laurent Destailleur
86a6a83647 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/admin/tools/index.php
	htdocs/bookmarks/bookmarks.lib.php
	htdocs/compta/facture.php
	htdocs/core/tpl/passwordforgotten.tpl.php
	htdocs/fourn/ajax/getSupplierPrices.php
	htdocs/main.inc.php
	htdocs/product/stats/card.php
	htdocs/public/paypal/paymentko.php
 2017-06-18 21:13:48 +02:00
Laurent Destailleur
285b5563d6 Update changelog 2017-06-17 18:23:26 +02:00
Laurent Destailleur
bb091c3b8b FIX The hook formObjectOptions was not implemented correctly in previous 
version. Sometimes, you had to return output 
content by doing a print into function, sometimes by returning content
into "resprint". This has been fixed to follow
hook specifications so you must return output into "resprint".
 2017-06-11 10:45:45 +02:00
Laurent Destailleur
9a30e8edc6 Update changelog 2017-06-10 00:22:12 +02:00
Laurent Destailleur
7587a3d592 Merge branch 'develop' into develop_transverse 2017-06-08 10:25:04 +02:00
Regis Houssin
b66da3d148 New: big refactorization of multicompany transverse mode 2017-06-06 10:23:33 +02:00
Regis Houssin
a25facef7c Fix: use 0 instead false 2017-06-03 11:49:59 +02:00
Regis Houssin
2df33d1df3 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_mc
 2017-06-03 11:45:15 +02:00
Laurent Destailleur
7f18dfee0d Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	dev/skeletons/build_class_from_table.php
	dev/skeletons/skeleton_card.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/filefunc.inc.php
	htdocs/projet/card.php
 2017-06-03 01:55:05 +02:00
Laurent Destailleur
82ddf293b6 Prepare 5.0.3 2017-05-31 13:29:31 +02:00
Laurent Destailleur
c9a09adf79 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/main.lang
 2017-05-31 12:50:29 +02:00
Laurent Destailleur
b2779e2c08 Typo 2017-05-31 12:05:53 +02:00
Regis Houssin
5c5663c5ae New: getEntity function use true $shared value by default 2017-05-30 18:50:54 +02:00
Laurent Destailleur
11f58c7bda Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-05-30 00:44:42 +02:00
Laurent Destailleur
8edce66c08 Update ChangeLog for 4.0.6 2017-05-29 21:27:35 +02:00
Regis Houssin
954670731d Fix: changelog 2017-05-25 09:05:19 +02:00
Laurent Destailleur
955c9f4217 Standardize the way online payments are working. 
Removed the trigger file of PAYPAL module that stored data that was not
used by Dolibarr. The trigger event still exists, but if an external
module need action on it, it must provides itself its trigger file.
 2017-05-13 21:10:56 +02:00
Laurent Destailleur
e5c898e0d6 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	build/makepack-dolibarr.pl
	htdocs/fichinter/list.php
	htdocs/product/list.php
	htdocs/projet/tasks/list.php
 2017-05-10 00:48:27 +02:00
Laurent Destailleur
a7e9dc1ce4 Prepare 5.0.2 2017-05-06 13:06:33 +02:00
Laurent Destailleur
865c8140d1 Clean code 2017-04-30 03:23:06 +02:00
Laurent Destailleur
b054ca8267 NEW Introduce mass action on product list ('delete' for the moment) 2017-04-09 15:02:55 +02:00
Laurent Destailleur
f598bf8bef Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2017-04-06 21:59:11 +02:00
Laurent Destailleur
8363bee234 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/filefunc.inc.php
 2017-04-06 21:56:48 +02:00
Laurent Destailleur
e8767122b0 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/societe/list.php
 2017-04-03 11:05:19 +02:00
Laurent Destailleur
da3fdbc9f0 Prepare 5.0.1 2017-04-02 22:18:41 +02:00
Laurent Destailleur
4d7b059eb3 Release 4.0.5 2017-04-02 18:50:34 +02:00
Laurent Destailleur
b9a9997688 Page societe/soc.php and compta/facture.php was renamed into card.php 
to match page naming conventions.
 2017-03-20 21:29:22 +01:00
Laurent Destailleur
372cb40cf9 The trigger USER_SETINGROUP and USER_REMOVEFROMGROUP has been replaced 
with trigger USER_MODIFY
 2017-02-28 12:10:45 +01:00
Laurent Destailleur
74e8fb9c19 NEW Can set number of dump to keep with job "local database backup" 2017-02-27 02:04:25 +01:00
fappels
52b92995cc use method commande->availability 2017-02-01 19:49:52 +01:00
fappels
8b2d0064a3 Update changelog for developer 2017-02-01 16:51:42 +01:00
Laurent Destailleur
9889f0a4a2 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/core/modules/modProjet.class.php
	htdocs/filefunc.inc.php
 2017-01-26 10:44:50 +01:00
Laurent Destailleur
fd55ded996 Prepare 4.0.4 version 2017-01-24 18:45:57 +01:00
Laurent Destailleur
d2b766f9f4 Fix PHP 7.1 2017-01-16 10:17:25 +01:00
Laurent Destailleur
10a10f459c Update ChangeLog 2017-01-16 01:23:43 +01:00
Laurent Destailleur
c635baa848 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/langs/en_US/errors.lang
 2017-01-03 01:34:15 +01:00
Laurent Destailleur
157b17b6d5 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 
Conflicts:
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/errors.lang
 2017-01-03 01:31:58 +01:00
Laurent Destailleur
ecab8d874b Merge changelog 2017-01-03 01:30:07 +01:00
Laurent Destailleur
bbd3734a21 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/filefunc.inc.php
 2016-12-26 12:42:23 +01:00
Laurent Destailleur
b2fbef4a91 Prepare 4.0.3 2016-12-25 23:04:59 +01:00
Laurent Destailleur
9cc2a74221 Update changelog 2016-12-23 16:29:15 +01:00
Laurent Destailleur
5520864970 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-12-12 10:46:43 +01:00
Laurent Destailleur
9d7db152ef Update doc 2016-12-12 10:46:11 +01:00
Laurent Destailleur
4969af8c74 Merge remote-tracking branch 'origin/4.0' into develop 
Conflicts:
	ChangeLog
	htdocs/product/card.php
 2016-12-11 11:04:15 +01:00
Laurent Destailleur
a45915e4a0 Better message after report on #5933 2016-12-10 12:04:13 +01:00
Laurent Destailleur
bc8b2ae331 Update doc 2016-12-08 13:13:46 +01:00
Laurent Destailleur
521eb3a520 Prepare 5.0 2016-12-08 12:44:58 +01:00
Laurent Destailleur
839f30bea9 Fix scrutinizer warnings 2016-11-22 19:45:28 +01:00
Laurent Destailleur
daca85627a Update doc 2016-11-08 13:08:10 +01:00
Laurent Destailleur
a658b7cc3d Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/comm/card.php
 2016-10-31 21:31:57 +01:00
Laurent Destailleur
f605f0dc77 Prepare 4.0.2 2016-10-30 02:35:20 +02:00
fappels
15377f11d7 developer changelog 
Method commande->deleteline($lindeid) has been replaced with
commande->deleteline($user, $lineid)
 2016-10-26 23:21:55 +02:00
Laurent Destailleur
99d24b8e62 Update doc 2016-10-26 10:36:22 +02:00
Laurent Destailleur
ba52eb870c Enhancement of Oauth module 2016-10-07 18:43:44 +02:00
Laurent Destailleur
03ebe769d7 Clean sources from not used libraries. 2016-10-05 00:38:17 +02:00
Laurent Destailleur
46f2f154c2 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 2016-10-04 19:47:45 +02:00
Laurent Destailleur
c0ea95df3e Enhance packager 2016-10-01 19:56:06 +02:00
Laurent Destailleur
ee252f549a Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	dev/skeletons/skeleton_list.php
	htdocs/accountancy/class/html.formventilation.class.php
	htdocs/core/lib/cron.lib.php
	htdocs/core/tpl/admin_extrafields_add.tpl.php
 2016-10-01 18:42:50 +02:00
Laurent Destailleur
db2469b996 Update changelog 2016-10-01 14:33:49 +02:00
Laurent Destailleur
7bf1d6cc9c Push file signature on server 2016-09-30 16:05:33 +02:00
Laurent Destailleur
3f2ae3b881 Update changelog 2016-09-28 18:16:33 +02:00
Laurent Destailleur
616594355b NEW Can select fields on expense report list. Can make mass delete. 2016-09-09 15:36:33 +02:00
Laurent Destailleur
d1719bad5a Fix ChangeLog 2016-09-05 01:36:06 +02:00
Laurent Destailleur
eee53998ad Mark function as deprecated #5577 2016-09-02 22:14:15 +02:00
Laurent Destailleur
3e84d227b3 Remove not used function calculate_byte. Use dol_print_size instead. 2016-08-31 19:57:17 +02:00
Regis Houssin
6e40f9e700 Merge remote-tracking branch 'dolibarr/develop' into develop_origin 
Conflicts:
	htdocs/core/class/html.form.class.php

Change-Id: I87bdc02d611c2978a5a8b427f0e1b718b6453b59
 2016-08-25 10:15:26 +02:00
Laurent Destailleur
034b08ce56 NEW Add option "Hide images in Top menu". 2016-08-05 23:40:00 +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
4a1e263e68 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 2016-08-01 15:19:25 +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
Regis Houssin
6bf655c882 Merge remote-tracking branch 'dolibarr/develop' into develop_origin 
Conflicts:
	htdocs/societe/class/societe.class.php

Change-Id: I760cee3a4d7a59d6625efed8aa5dc16c9df043bb
 2016-07-28 09:53:10 +02:00
Laurent Destailleur
9e70f49fc5 Update changelog 2016-07-26 13:56:11 +02:00
Regis Houssin
4b8f42949c # WARNING: head commit changed in the meantime 
Change-Id: I27dc1da6ca41955468f3661433e41c72a277f670
 2016-07-25 21:05:11 +02:00
Laurent Destailleur
c0d8bce2df Prepare 3.8.5 2016-07-21 19:44:25 +02:00
Laurent Destailleur
1914b98375 Merge remote-tracking branch 'origin/3.9' into 4.0 2016-07-17 12:52:20 +02:00
Laurent Destailleur
587484fabb Prepare 3.9.3 2016-07-16 20:03:04 +02:00
Regis Houssin
785489dbcb Fix: changelog 2016-07-07 12:49:40 +02:00
Laurent Destailleur
29fa49c99d Prepare package 4.0 2016-06-28 01:50:27 +02:00
Laurent Destailleur
232f525f29 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/core/lib/project.lib.php
 2016-06-15 18:31:43 +02:00
Laurent Destailleur
fb254d3287 Update changelog for 3.9.2 2016-06-06 13:47:46 +02:00
Laurent Destailleur
b339dc18f4 Update changelog 2016-06-03 21:32:36 +02:00
Laurent Destailleur
ea0927ee9d ChangeLog of 4.0 is ready 2016-06-02 13:28:09 +02:00
Laurent Destailleur
6feabe5049 ChangeLog of 4.0 is ready 2016-06-02 13:27:18 +02:00
Laurent Destailleur
79291b7a77 Prepare 4.0 2016-05-31 00:35:21 +02:00
Laurent Destailleur
eba29890d8 Update changelog #5107 2016-04-29 18:57:20 +02:00
Laurent Destailleur
8fe799f424 Merge branch 'dol_resource' of https://github.com/aternatik/dolibarr 
into aternatik-dol_resource

Conflicts:
	dev/initdata/img/printcompany.png
	htdocs/compta/bank/card.php
 2016-04-29 17:51:11 +02:00
Laurent Destailleur
42f10234b1 Fix regression 2016-04-29 15:28:26 +02:00
Laurent Destailleur
5bfc65676c Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	ChangeLog
	htdocs/commande/class/commande.class.php
	htdocs/filefunc.inc.php
	htdocs/theme/eldy/style.css.php
 2016-04-22 21:02:20 +02:00
Laurent Destailleur
f96f8eac85 Merge remote-tracking branch 'origin/3.8' into 3.9 2016-04-22 20:09:51 +02:00
Laurent Destailleur
980f3d522f Prepare 3.9.1 2016-04-22 20:09:42 +02:00
Laurent Destailleur
25810ddfc8 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/compta/localtax/quadri_detail.php
	htdocs/core/lib/tax.lib.php
 2016-04-22 20:08:33 +02:00
Laurent Destailleur
68e96b98c5 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	ChangeLog
	htdocs/filefunc.inc.php
 2016-04-22 20:02:34 +02:00
Laurent Destailleur
7f5670cb26 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	ChangeLog
 2016-04-22 19:49:27 +02:00
Laurent Destailleur
0ef1be9364 Prepare 3.9.1 2016-04-22 18:07:34 +02:00
Laurent Destailleur
c2de7adb32 Minor PHPCS fixes 2016-04-21 03:18:42 +02:00
Laurent Destailleur
f8b39ab50e Fix errors reported by scrutinizer 2016-04-09 19:04:23 +02:00
Laurent Destailleur
a43a0a3f4c Debug module loan and disable non working features 2016-04-06 11:21:55 +02:00
Laurent Destailleur
85cd0038f5 Merge remote-tracking branch 'origin/3.9' into develop 2016-03-25 16:10:10 +01:00
Laurent Destailleur
91caea5707 Code was corrupted with very bad commits. I restore files manually. 2016-03-25 15:53:44 +01:00
Regis Houssin
b38e75c404 Merge branch '3.8_fix_merge' into 3.9_fix_merge 2016-03-23 14:03:35 +01:00
Regis Houssin
20d785ad28 Merge remote-tracking branch 'origin/3.7' into 3.8_fix_merge 
Conflicts:
	htdocs/filefunc.inc.php
 2016-03-23 13:40:05 +01:00
Marcos García
d15da596d8 Update ChangeLog 2016-03-21 22:24:46 +01:00
Marcos García de La Fuente
bfbcf7a64c Unintended changes 2016-03-21 21:57:00 +01:00
Marcos García de La Fuente
d9dab762ad Added changes to the changelog 2016-03-21 21:55:57 +01:00
Marcos García de La Fuente
89bd173c2f NEW Rename Form::select_date to Form::selectDate and Form::form_date to Form::formDate 2016-03-21 21:51:29 +01:00
Laurent Destailleur
2b1f57f01e Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	dev/initdata/savedemo.sh
	htdocs/filefunc.inc.php
	htdocs/user/card.php
 2016-03-18 11:54:14 +01:00
philippe grand
d434cee3fa [Qual] Typo 2016-03-17 09:40:05 +01:00
Laurent Destailleur
543f5cef63 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	dev/initdata/initdemo.sh
	htdocs/accountancy/journal/bankjournal.php
	htdocs/accountancy/journal/purchasesjournal.php
	htdocs/commande/card.php
	htdocs/compta/facture.php
 2016-03-13 01:31:12 +01:00
Laurent Destailleur
e0809fc750 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	ChangeLog
	build/makepack-dolibarr.pl
	htdocs/compta/facture.php
	htdocs/product/document.php
 2016-03-12 18:40:50 +01:00
Laurent Destailleur
731d1cfe41 Update changelog for 3.8.4 2016-03-12 12:07:11 +01:00
Laurent Destailleur
444fce0bd9 Prepare 3.7.4 2016-03-11 18:34:05 +01:00
Laurent Destailleur
e669dac398 Prepare 3.6.7 2016-03-11 18:28:39 +01:00
Laurent Destailleur
a45ffeecca Missing changelog 2016-03-11 18:21:57 +01:00
Laurent Destailleur
cbd102fa45 Merge and rename method into camel format 2016-03-04 16:28:38 +01:00