lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
76,942 Commits 43 Branches 150 Tags 886 MiB
116c6d7a6a
Commit Graph

2108 Commits

Author SHA1 Message Date
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
Laurent Destailleur
adb66eddf1 Fix generation of rpm packages 2016-02-06 18:15:54 +01:00
Laurent Destailleur
d85f7be1f5 FIX #4423 2016-02-03 02:06:12 +01:00
Laurent Destailleur
3dafe76f5e Complete changelog 2016-01-08 14:51:20 +01:00
Laurent Destailleur
0f7fd47a44 Clean changelog 2016-01-02 13:05:10 +01:00
Laurent Destailleur
0314b3b5b1 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	ChangeLog
 2016-01-02 12:27:08 +01:00
Laurent Destailleur
8f0a004a58 Merge remote-tracking branch 'origin/3.7' into 3.8 2016-01-02 12:24:20 +01:00
Laurent Destailleur
e4640ca4c3 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/install/upgrade.php
 2016-01-02 12:22:00 +01:00
Laurent Destailleur
a2e93056f7 Prepare 3.8.3 2015-12-27 23:42:09 +01:00
Laurent Destailleur
f13df0f952 Prepare 3.7.3 2015-12-27 20:17:46 +01:00
Laurent Destailleur
a2c8208541 Prepare 3.6.5 2015-12-27 19:17:05 +01:00
Laurent Destailleur
c64eac5e72 Fix doc and mysql min version 2015-12-27 17:05:56 +01:00
Laurent Destailleur
065b7b6683 Fix ba alignement 2015-12-19 19:12:21 +01:00
Laurent Destailleur
e470869afe Prepare 3.9 2015-12-06 14:35:36 +01:00
Laurent Destailleur
d9533e9001 Prepare 3.9 2015-12-06 14:27:52 +01:00
Laurent Destailleur
0279e99b0a Update warning for mysql 5.5.4* bug 2015-12-06 12:04:34 +01:00
Laurent Destailleur
ab177b43af Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	ChangeLog
	htdocs/.gitignore
	htdocs/comm/mailing/card.php
	htdocs/commande/list.php
	htdocs/compta/facture.php
	htdocs/expedition/class/expedition.class.php
 2015-11-13 12:35:10 +01:00
Laurent Destailleur
93be4305c4 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	build/makepack-dolibarr.pl
	htdocs/accountancy/customer/card.php
	htdocs/accountancy/customer/list.php
	htdocs/accountancy/supplier/card.php
	htdocs/accountancy/supplier/list.php
	htdocs/commande/card.php
	htdocs/commande/class/commande.class.php
	htdocs/fichinter/card.php
	htdocs/societe/rib.php
 2015-11-13 12:18:46 +01:00
Laurent Destailleur
eac80d7db4 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	ChangeLog
	build/debian/changelog
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
 2015-11-13 11:43:29 +01:00
Laurent Destailleur
722a133b31 FIX Add a protection to not make release if ChangeLog was not generated. 
Prepare package 3.6.5

Conflicts:
	ChangeLog

Conflicts:
	ChangeLog
 2015-11-08 15:09:57 +01:00
Laurent Destailleur
9b8bb114cd FIX Add a protection to not make release if ChangeLog was not generated. 
Prepare package 3.7.2

Conflicts:
	ChangeLog
 2015-11-08 14:55:12 +01:00
Laurent Destailleur
c639e82062 FIX Add a protection to not make release if ChangeLog was not generated. 
Conflicts:
	ChangeLog
 2015-11-08 14:45:56 +01:00
Laurent Destailleur
6b98c50510 FIX Add a protection to not make release if ChangeLog was not generated. 2015-11-08 12:16:30 +01:00
Laurent Destailleur
972c364c37 FIX Add a protection to not make release if ChangeLog was not generated. 
Prepare package 3.8.2
 2015-11-08 12:12:28 +01:00
Laurent Destailleur
9f21ea58a3 A lot hooks used into PDF generation were not correctly implemented. We 
had to fix this. The result si that
the following hook were set as hook of type "replace". This means if
your module implement such hooks, it must 
return 0 to execute standard code or 1 to replace standard code (value
to output should be set into resPrints instead).
 2015-10-22 17:51:05 +02:00
Laurent Destailleur
b9001d7ab8 NEW Prepare database to store information per files (for example to 
define if an image ca, be used as a cover or not)
 2015-10-18 22:43:19 +02:00
Laurent Destailleur
b3491ef4e5 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	ChangeLog
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/facture/admin/facture_cust_extrafields.php
	htdocs/compta/facture/admin/facturedet_cust_extrafields.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/contrat/card.php
 2015-10-16 10:12:36 +02:00
Laurent Destailleur
8a02c8288b Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/product/index.php
 2015-10-16 09:56:55 +02:00
Laurent Destailleur
9b85a70013 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	ChangeLog
	htdocs/comm/propal.php
	htdocs/comm/propal/class/propal.class.php
 2015-10-16 09:52:38 +02:00
Laurent Destailleur
e6e4f0500d Update changelog 2015-10-11 20:32:24 +02:00
Laurent Destailleur
df39a1054e Fix 3.8.1 2015-10-11 20:19:52 +02:00
Laurent Destailleur
9fa2afb44b Merge branch '3.6' of github.com:Dolibarr/dolibarr into 3.6 
Conflicts:
	ChangeLog
 2015-10-11 19:55:50 +02:00
Marcos García de La Fuente
fd9f51df88 Missing changelog 2015-10-11 12:39:42 +02:00
Marcos García de La Fuente
9f1fa7e212 Missing changelog 2015-10-11 12:32:02 +02:00
Juanjo Menent
31230d296d Merge remote-tracking branch 'upstream/3.8' into develop 2015-10-03 23:51:38 +02:00
philippe grand
e22fb3c538 fix : Typo 2015-10-02 12:39:09 +02:00
philippe grand
8a9c9f49d5 fix : Typo 2015-10-02 12:37:13 +02:00
Laurent Destailleur
8ff41a8ded Enhance performance of option MAIN_OVERWRITE_TRANS_ 2015-09-17 15:35:51 +02:00
Laurent Destailleur
7fd01d4aa3 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/accountancy/class/bookkeeping.class.php
	htdocs/compta/paiement/cheque/class/remisecheque.class.php
	htdocs/product/class/html.formproduct.class.php
	htdocs/product/stock/index.php
	htdocs/product/stock/list.php
	htdocs/product/stock/mouvement.php
	htdocs/product/stock/product.php
	htdocs/product/stock/valo.php
 2015-09-09 12:45:22 +02:00
Juanjo Menent
c13d2d202b Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	ChangeLog
	htdocs/filefunc.inc.php
 2015-09-08 21:08:59 +02:00
Laurent Destailleur
d19ec89bf1 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/core/modules/modHoliday.class.php
	htdocs/holiday/card.php
 2015-09-03 23:27:47 +02:00
Laurent Destailleur
c7b7dff0ed Merge branch 'bug-3460' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-3460

Conflicts:
	ChangeLog
 2015-09-03 19:14:37 +02:00
Laurent Destailleur
54214cfddf Merge branch 'bug-3383' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-3383

Conflicts:
	ChangeLog
 2015-09-03 19:12:01 +02:00
Laurent Destailleur
be9d5b030d Merge branch 'bug-3358' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-3358

Conflicts:
	ChangeLog
 2015-09-03 19:08:08 +02:00
Laurent Destailleur
b0f604da14 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 
Conflicts:
	ChangeLog
 2015-09-03 17:05:02 +02:00
Marcos García de La Fuente
ded6e7d6d9 Merge branch '3.7' into bug-3358 
# Conflicts:
#	ChangeLog
 2015-09-03 12:32:03 +02:00
Marcos García de La Fuente
2d5331b8f8 FIX [ #3460 ] Selected bank account was not saved when an error happened when trying to create a customer invoice 
Close #3460
 2015-09-03 12:13:03 +02:00
Marcos García de La Fuente
67b7162c59 Merge branch '3.7' into bug-3383 
# Conflicts:
#	ChangeLog
 2015-09-03 12:05:19 +02:00
Marcos García de La Fuente
86dd751f29 Merge branch '3.7' into bug-incorrect-pdf-bank 
# Conflicts:
#	ChangeLog
 2015-09-03 12:03:24 +02:00
Marcos García de La Fuente
0955432de3 Merge branch '3.7' into bug-iban-whitespaces-37 
# Conflicts:
#	ChangeLog
 2015-09-03 12:02:23 +02:00
Marcos García de La Fuente
7a115c9366 Typo 2015-09-03 11:59:46 +02:00
Marcos García de La Fuente
bd21cf5d68 Updated changelog 2015-09-03 11:58:20 +02:00
Marcos García de La Fuente
216827b1d8 FIX [ bug #3358 ] Tasks box does not work with PostgreSQL 
Close #358
 2015-09-01 11:26:59 +02:00
Marcos García de La Fuente
3134950dbe FIX [ bug #3383 ] Company name is overlapped with company direction in PDF models 
Close #3383
 2015-09-01 11:19:05 +02:00
Marcos García de La Fuente
c4f9bde14d FIX [ bug #3431 ] Invoice bank account is not respected 
Close #3431
 2015-09-01 11:09:37 +02:00
Marcos García de La Fuente
9ec349f410 FIX [ bug #3432 ] Spaces should be removed from IBAN when formatting it 
Close #3432
 2015-09-01 10:56:55 +02:00
Laurent Destailleur
00b9f98c1c Merge remote-tracking branch 'origin/3.7' into develop 2015-08-31 12:15:20 +02:00
Marcos García de La Fuente
b953d2c466 FIX [ bug #3426 ] Unable to create an invoice from a contract with extrafields 
Close #3426
 2015-08-29 19:42:51 +02:00
Laurent Destailleur
15ab9c0ecd Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/core/lib/security.lib.php
	htdocs/product/stock/mouvement.php
 2015-08-20 16:08:42 +02:00
Laurent Destailleur
259a4e0694 Update doc 2015-08-19 18:52:18 +02:00
Marcos García de La Fuente
b3a7b44046 FIX [ bug #3321 ] Users with certain permissions were shown a "forbidden access" page even if they had the rights 
Close #3321
 2015-08-14 12:29:32 +02:00
Laurent Destailleur
fc8a822f1d Merge remote-tracking branch 'origin/3.7' into develop 2015-08-13 04:03:23 +02:00
Laurent Destailleur
c73fe965d2 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture/class/facture.class.php
 2015-08-13 03:58:32 +02:00
Laurent Destailleur
1595765ec8 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
 2015-08-13 03:18:02 +02:00
Laurent Destailleur
dc4b429a33 Merge branch 'bug-3313' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-3313

Conflicts:
	ChangeLog
 2015-08-13 00:13:36 +02:00
Laurent Destailleur
4b51fc80a6 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 
Conflicts:
	ChangeLog
 2015-08-13 00:06:27 +02:00
Marcos García de La Fuente
02f4e9f5cb Merge branch '3.7' into bug-3211 
# Conflicts:
#	ChangeLog
 2015-08-11 10:12:36 +02:00
Juanjo Menent
c96573dcb4 Merge remote-tracking branch 'origin/3.7' into 3.8 2015-08-10 20:29:36 +02:00
Juanjo Menent
b3f3cdda3a Merge remote-tracking branch 'origin/3.6' into 3.7 2015-08-10 20:16:05 +02:00
Marcos García de La Fuente
e2797ddd40 Merge branch '3.6' into bug-3342 
# Conflicts:
#	ChangeLog
 2015-08-10 17:48:18 +02:00
Marcos García de La Fuente
202d12ffef Merge branch '3.7' into bug-3211 
# Conflicts:
#	ChangeLog
 2015-08-10 17:42:38 +02:00
Juanjo Menent
97b69ab85e Merge remote-tracking branch 'origin/3.7' into 3.8 
# Conflicts:
#	htdocs/compta/paiement_charge.php
 2015-08-10 12:22:30 +02:00
Juanjo Menent
9374b4f3e3 Merge remote-tracking branch 'origin/3.6' into 3.7 2015-08-10 12:14:18 +02:00
Juanjo Menent
b2f5ae7aa8 Merge remote-tracking branch 'origin/3.7' into 3.8 
# Conflicts:
#	htdocs/core/boxes/box_task.php
 2015-08-10 11:09:22 +02:00
Marcos García de La Fuente
2f6587b48e FIX [ bug #3211 ] Error about sold to pay (Montant encours) 
Close #3211
 2015-08-09 18:08:22 +02:00
Marcos García de La Fuente
f3ef4fed93 Fix: [ bug #3313 ] Error enabling module with PostgreSQL database 
Close #3313
 2015-08-09 13:58:03 +02:00
Marcos García de La Fuente
7cb564586e Fix: [ bug #3310 ] OrderLine::fetch, FactureLigne::fetch and PropaleLigne::fetch do not return anything 
Close #3310
 2015-08-09 13:52:02 +02:00
Marcos García de La Fuente
2f921b6431 Fix [ bug #3342 ]: Taxes dictionary page does not accept localized decimals for localtax2 rate 
Close #3342
 2015-08-09 13:46:48 +02:00
Marcos García de La Fuente
a24f29ba8b Fix [ bug #3341 ]: Missing translation in /compta/paiement_charge.php 
Close #3341
 2015-08-09 13:37:05 +02:00
Marcos García de La Fuente
cccc543065 Fix: [ bug #3288 ] Tasks box is not properly drawn 
Close #3288
 2015-08-09 13:16:55 +02:00
Juanjo Menent
761c50a885 Merge remote-tracking branch 'origin/3.7' into 3.8 2015-08-06 18:22:29 +02:00
fmarcet
62ad7d4d34 FIX: Not showing task extrafields when creating from left menu 2015-08-04 13:32:44 +02:00
Marcos García de La Fuente
a1f74763da Merge branch '3.5' into bug-3206 
Conflicts:
	ChangeLog
 2015-08-03 18:55:01 +02:00
Juanjo Menent
05b0a9b675 Merge remote-tracking branch 'origin/3.7' into 3.8 
# Conflicts:
#	htdocs/core/menus/standard/eldy.lib.php
 2015-08-01 14:50:07 +02:00
Laurent Destailleur
13dee1876a Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/compta/resultat/clientfourn.php
 2015-07-30 15:07:22 +02:00
Laurent Destailleur
6adc3ba604 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/core/menus/standard/eldy.lib.php
 2015-07-30 14:54:33 +02:00
Laurent Destailleur
ff8969073c Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/contrat/class/contrat.class.php
	htdocs/core/class/extrafields.class.php
	htdocs/main.inc.php
 2015-07-28 18:57:13 +02:00
fmarcet
6676114501 Fix: Not showing product supplier reference when page break 2015-07-27 16:31:40 +02:00
fmarcet
e130af8033 Fix: Not showing delivery date on rouget pdf (expedition) 2015-07-27 13:11:07 +02:00
Laurent Destailleur
38d30b5590 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/fourn/facture/card.php
 2015-07-21 00:17:11 +02:00
Marcos García de La Fuente
038f171d6c Fix: [ bug #3074 ] Accruals accounting use payment date instead of commitment date in turnover reports for salaries 
Close #3074
 2015-07-20 12:18:30 +02:00
Marcos García de La Fuente
db54b6f596 Fix: [ bug #3198 ] Trigger LINECONTRACT_INSERT passes Contrat as $object instead of ContratLigne 
Created new ContratLigne::insert function

Close #3198
 2015-07-20 11:19:40 +02:00
Laurent Destailleur
dafe0a37cf Merge branch 'bug-1925' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-1925

Conflicts:
	ChangeLog
 2015-07-19 15:31:02 +02:00
Laurent Destailleur
4f5e8e2480 Fix: missing context before calling trigger. 
Clean demo file with list of triggers.
 2015-07-19 15:24:54 +02:00
Marcos García de La Fuente
b64adcc065 FIX [ bug 1925 ] "Link to order" option in supplier invoices is not working properly 
Patch submitted by Philippe (pheno) at https://doliforge.org/tracker/?func=detail&aid=1925&group_id=144
 2015-07-19 15:13:27 +02:00
Marcos García de La Fuente
f2313748c8 Merge branch '3.7' into bug-1634 2015-07-19 14:57:39 +02:00
Marcos García de La Fuente
1be33e1dda FIX [ bug 1634 ] Error deleting a project when it had many linked objects 
Projet::delete was throwing DB error messages directly to the user instead of logging them and showing a proper error message to the user
 2015-07-19 14:56:52 +02:00
Marcos García de La Fuente
5b0c216b42 Merge branch '3.5' into bug-1791 
Conflicts:
	ChangeLog
 2015-07-19 13:48:04 +02:00
Marcos García de La Fuente
8505e91469 Fix: [ bug 1791 ] Margin menu not available if any Finance module is not enabled 2015-07-19 13:46:25 +02:00
Laurent Destailleur
2f2b0df6f8 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/contact/exportimport.php
	htdocs/contact/info.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.form.class.php
	htdocs/core/modules/DolibarrModules.class.php
	htdocs/core/modules/modSociete.class.php
	htdocs/core/tpl/document_actions_pre_headers.tpl.php
	htdocs/langs/fr_FR/categories.lang
	htdocs/main.inc.php
	htdocs/product/reassort.php
	htdocs/projet/list.php
	htdocs/societe/info.php
 2015-07-19 12:26:31 +02:00
Laurent Destailleur
2bb1945a2f Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/compta/prelevement/class/rejetprelevement.class.php
	htdocs/compta/sociales/class/paymentsocialcontribution.class.php
	htdocs/contact/exportimport.php
	htdocs/contact/ldap.php
	htdocs/contact/perso.php
	htdocs/contact/vcard.php
	htdocs/core/class/commonobject.class.php
	htdocs/product/reassort.php
	htdocs/projet/liste.php
	htdocs/societe/consumption.php
	htdocs/societe/info.php
 2015-07-19 12:04:30 +02:00
Laurent Destailleur
fbc0b5b313 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/contact/vcard.php
	htdocs/societe/consumption.php
 2015-07-19 11:38:44 +02:00
Laurent Destailleur
2e2f99c351 Merge branch 'bug-3180' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-3180

Conflicts:
	ChangeLog
 2015-07-19 11:28:48 +02:00
Laurent Destailleur
4100026c71 Merge branch 'bug-3268' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-3268

Conflicts:
	ChangeLog
 2015-07-19 11:27:28 +02:00
Laurent Destailleur
8d7c1f8d4c Fix: [ bug #2570 ] [Contacts] Page should not process if ID is invalid 2015-07-19 11:21:21 +02:00
Marcos García de La Fuente
3d6c5b09e8 Fix: [ bug #3268 ] SQL error when accessing thirdparty log page without a socid parameter 
Close #3268
 2015-07-19 11:19:47 +02:00
Marcos García de La Fuente
538c8c072b Merge branch '3.5' into bug-3180 
Conflicts:
	ChangeLog
 2015-07-19 11:16:36 +02:00
Marcos García de La Fuente
d0b1652efd Merge branch '3.5' into bug-3206 
Conflicts:
	ChangeLog
 2015-07-19 11:16:10 +02:00
Marcos García de La Fuente
4649cf7210 Fix: [ bug #3206 ] PropaleLigne, OrderLine and FactureLigne given to triggers through update function does not contain all the information 
Close #3206
 2015-07-18 19:40:48 +02:00
Marcos García de La Fuente
b28c4df0d6 Fix: [ bug #3180 ] formObjectOptions hook when editing thirdparty card does not print result 
Close #3180
 2015-07-18 17:35:36 +02:00
Marcos García de La Fuente
7185cfeb84 Fix: [ bug #2715 ] Statistics page has broken layout with long thirdparty names 2015-07-18 14:48:59 +02:00
Marcos García de La Fuente
e9d1e6265d Fix: [ bug #2696 ] Adding complementary attribute fails if code is numerics 
Close #2696
 2015-07-18 14:25:05 +02:00
Laurent Destailleur
3add8d5ca0 Update doc 2015-07-14 16:30:24 +02:00
Laurent Destailleur
fd7908d849 Update doc 2015-07-14 16:27:28 +02:00
Laurent Destailleur
08c38feb98 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	ChangeLog
 2015-07-12 18:57:29 +02:00
Laurent Destailleur
1ba5afbc7d Update doc. Prepare 3.8 2015-07-12 18:56:00 +02:00
Laurent Destailleur
a7ea92fd6b Update doc. Prepare 3.8 2015-07-12 18:53:08 +02:00
Marcos García de La Fuente
cba902c5ae Fix: [ bug #3055 ] Product image thumbnails were not deleted after deleting the image 
Close #3055
 2015-07-07 09:40:23 +02:00
Regis Houssin
b70dfd0d54 New: possibility to defined a tab for all entities in module descriptor 2015-07-03 11:16:24 +02:00
Laurent Destailleur
0a2bafaa6d The trigger USER_LOGIN* are deprecated. They are still working but you 
should prefer use the hook afterLogin or afterLoginFailed instead.
 2015-06-27 21:52:23 +02:00
Regis Houssin
c05bf7e977 New: Possibility to add javascript in main login page with 
"getLoginPageOptions" hook
 2015-06-26 19:37:37 +02:00
Marcos García de La Fuente
d8b7f3618c Updated changelog 2015-06-16 21:20:42 +02:00
Laurent Destailleur
417eae9c4f Merge remote-tracking branch 'origin/3.7' into develop 2015-06-16 11:18:51 +02:00