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

1789 Commits

Author SHA1 Message Date
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
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