Commit Graph

42841 Commits

Author SHA1 Message Date
Marcos García de La Fuente
41e01a22a3 Fixed loading of external numeration modules in Contrat, Commande, Facture, Contrat, Expedition, Fichinter, CommandeFournisseur and uniformized code 2015-01-17 18:58:05 +01:00
Marcos García de La Fuente
ed839114ab Fixed loading of external numeration modules in FactureFournisseur and Propal 2015-01-17 18:42:19 +01:00
Juanjo Menent
fe5533d1c3 Fix: PostgreSQL compatibilty 2015-01-16 17:41:56 +01:00
Laurent Destailleur
d1a0187f82 Merge pull request #2236 from marcosgdf/translations
Corrected translation typos
2015-01-16 12:10:32 +01:00
Laurent Destailleur
767afd3c9f Merge pull request #2231 from KreizIT/fix_cron
Fix cron
2015-01-16 12:08:30 +01:00
Laurent Destailleur
6f00cecd81 Merge pull request #2244 from KreizIT/fix_default_empty
FIX : Creating default object from empty when validating supplier order
2015-01-16 12:03:23 +01:00
Laurent Destailleur
4c8de74140 Merge pull request #2242 from marcosgdf/3.6
Fix: [ bug #1801 ] FAC_FORCE_DATE_VALIDATION constant alters supplier invoice date given to numeration modules
2015-01-16 12:02:24 +01:00
Cedric
999a6052ff FIX : Creating default object from empty when validating supplier order 2015-01-15 16:23:10 +01:00
Marcos García de La Fuente
88c3509dd0 Merge remote-tracking branch 'upstream/3.6' into 3.6
Conflicts:
	ChangeLog
2015-01-15 13:09:23 +01:00
Marcos García de La Fuente
71b609fab0 Fix: [ bug #1801 ] FAC_FORCE_DATE_VALIDATION constant alters supplier invoice date given to numeration modules 2015-01-15 13:08:33 +01:00
Juanjo Menent
d40eab2494 Fix: withdrawal create error if in the same month are deleted previus
withdrawals.
2015-01-15 09:57:20 +01:00
Marcos García de La Fuente
7b4cf976df Corrected translation typos 2015-01-13 09:42:46 +01:00
Cedric
d2cd841573 Fix divide by zero error 2015-01-12 13:23:18 +01:00
Cedric
26cad2400e Fix missing lang key 2015-01-12 13:18:50 +01:00
Laurent Destailleur
c441aa89db Fixed: Avoid warning 2015-01-10 18:19:44 +01:00
Laurent Destailleur
90add2fa96 Fix: amarok is a bugged theme making dolidroid failed. We swith to
eldy automatically with dolidroid.
2015-01-10 17:23:52 +01:00
Laurent Destailleur
32edb33411 Start 3.6.3 2015-01-09 22:32:25 +01:00
Laurent Destailleur
068ae7f0d4 - Fix: ref_ext was not saved when recording a customer order from web
service
2015-01-09 22:32:00 +01:00
Laurent Destailleur
4ce7a27dca Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2015-01-06 00:28:07 +01:00
Laurent Destailleur
a668d163fd Repair corrupted data 2015-01-06 00:27:35 +01:00
Laurent Destailleur
e5f81b1fec Merge pull request #2202 from defrance69/patch-38
Update facture.php
2015-01-06 00:13:55 +01:00
Laurent Destailleur
337d055872 Merge pull request #2199 from altatof/3.6
FIX: dont remove price ht if it is forced (ie: calculated by margin rate and cost price, or by external module)
2015-01-06 00:10:08 +01:00
BENKE Charles
191d4467e3 Update facture.php
$soc already filled upper when $socid send
2014-12-28 12:31:27 +01:00
Christophe Battarel
1ab6955494 FIX: dont remove price ht if it is forced (ie: calculated by margin rate
and cost price, or by external module)
2014-12-27 11:27:41 +01:00
Laurent Destailleur
c7937a9962 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2014-12-27 02:22:09 +01:00
Laurent Destailleur
953e736a97 Prepare version 3.6.2 2014-12-27 02:21:37 +01:00
Juanjo Menent
d40229e9cc Fix: Bad order field value 2014-12-26 09:14:19 +01:00
Laurent Destailleur
75dbcf4a78 Fixed: doxygen 2014-12-26 04:35:48 +01:00
Laurent Destailleur
d18770c1e7 Merge remote-tracking branch 'origin/3.5' into 3.6 2014-12-26 04:16:08 +01:00
Laurent Destailleur
490b0c5f3a Merge branch 'marcosgdf-bug-1768' into 3.5 2014-12-26 04:13:36 +01:00
Laurent Destailleur
77e48f8c3e Merge branch 'bug-1768' of https://github.com/marcosgdf/dolibarr into marcosgdf-bug-1768 2014-12-26 04:12:58 +01:00
Laurent Destailleur
882fd9a798 Merge branch 'marcosgdf-bug-1757' into 3.5 2014-12-26 04:11:30 +01:00
Laurent Destailleur
38c9d39c2b Merge branch 'bug-1757' of https://github.com/marcosgdf/dolibarr into
marcosgdf-bug-1757

Conflicts:
	ChangeLog
2014-12-26 04:11:15 +01:00
Laurent Destailleur
4e2c321e4d Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5
Conflicts:
	ChangeLog
2014-12-26 04:09:08 +01:00
Laurent Destailleur
83e34a1c4e Merge branch 'marcosgdf-bug-1769' into 3.5 2014-12-26 04:07:53 +01:00
Laurent Destailleur
f31bf5d80e Merge pull request #2175 from marcosgdf/bug-1752
Fix: [ bug #1752 ] Date filter of margins module, filters since 12H instead of 00H
2014-12-26 03:49:02 +01:00
Laurent Destailleur
ade688b589 Merge pull request #2174 from marcosgdf/bug-1723
Fix [ bug #1723 ] Draft tasks?
2014-12-26 03:48:15 +01:00
Laurent Destailleur
b2d27a7d25 Merge pull request #2173 from marcosgdf/translation
Fixed string not translated in linked objects of a project
2014-12-26 03:47:56 +01:00
Marcos García de La Fuente
8e47fe9e1c Fix: [ bug #1757 ] Sorting breaks product/service statistics 2014-12-26 00:19:09 +01:00
Marcos García de La Fuente
1d39c1acc2 Fix: [ bug #1768 ] PHP Warning when error connecting to a PostgreSQL server in install script 2014-12-26 00:12:16 +01:00
Marcos García de La Fuente
f4def9ea28 Fix: [ bug #1769 ] Error when installing to a PostgreSQL DB that contains numbers 2014-12-26 00:07:24 +01:00
Laurent Destailleur
f3fded2a0a Merge pull request #2171 from marcosgdf/bug-1649
Fix: [ bug #1649 ] Cancel button of several thirdparty actions, does the same thing as modify
2014-12-25 23:25:22 +01:00
Laurent Destailleur
6c67df0698 Merge branch 'marcosgdf-bug-1731' into 3.6 2014-12-25 23:21:55 +01:00
Laurent Destailleur
224fa14e16 Merge branch 'bug-1731' of https://github.com/marcosgdf/dolibarr into
marcosgdf-bug-1731

Conflicts:
	ChangeLog
2014-12-25 23:21:48 +01:00
Laurent Destailleur
33045668cd Merge pull request #2168 from frederic34/patch-5
Translation error
2014-12-25 23:19:42 +01:00
Marcos García de La Fuente
c050fe2a27 Merge branch '3.6' into bug-1649
Conflicts:
	ChangeLog
2014-12-25 01:27:57 +01:00
Marcos García de La Fuente
82fa3a447b Merge branch '3.6' into translation 2014-12-25 01:18:58 +01:00
Juanjo Menent
c4a6377af5 Merge pull request #2169 from marcosgdf/bug-1736
Fix: [ bug #1736 ] Failing supplier Elephant numeration module with some masks
2014-12-24 14:27:06 +01:00
Marcos García de La Fuente
416f13c708 Fix: [ bug #1752 ] Date filter of margins module, filters since 12H instead of 00H 2014-12-23 16:00:04 +01:00
Marcos García de La Fuente
743867b91b Spanish translation 2014-12-23 15:57:30 +01:00