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

45099 Commits

Author SHA1 Message Date
Frédéric FRANCE
3690d11ca2 Update pdf.lib.php 2016-06-23 10:48:52 +02:00
Laurent Destailleur
7f0ed90652 Merge pull request #5385 from simnandez/3.9 
FIX: Bad column totalizing if MAIN_SHOW_HT_ON_SUMMARY activated
 2016-06-23 10:01:34 +02:00
Laurent Destailleur
f514400d87 FIX a case of corrupted ODT by Word that insert <text:s> when it should 
not.
 2016-06-22 20:08:29 +02:00
Juanjo Menent
0d62bd704e Fix: Bad column totalizing if MAIN_SHOW_HT_ON_SUMMARY activated 2016-06-22 18:59:51 +02:00
Laurent Destailleur
386b19d4b1 Fix regression. Add hidden option PROPAL_DISABLE_SIGNATURE to restore 
old behaviour.
 2016-06-19 17:56:34 +02:00
Laurent Destailleur
d717757594 Protect against bad value of accurancy to avoid javascript error 2016-06-17 10:40:11 +02:00
Laurent Destailleur
76df7afa85 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-06-17 10:35:30 +02:00
Laurent Destailleur
a3d53b269f FIX javascript error with german-switzerland language 2016-06-17 10:35:18 +02:00
Laurent Destailleur
19eacba248 Merge pull request #5348 from frederic34/patch-8 
FIX Bad name of table into sql request llx_accountingaccount instead of llx_accounting_account
 2016-06-16 20:35:21 +02:00
Laurent Destailleur
b4384c13e1 Merge pull request #5349 from atm-maxime/3.9 
FIX #5343
 2016-06-16 20:19:08 +02:00
Frédéric FRANCE
bc22f39aa4 Update import.php 2016-06-16 20:18:58 +02:00
Laurent Destailleur
252ca09717 Merge pull request #5358 from ndrosis/patch-24 
Greece VAT 23 -> 24
 2016-06-16 20:09:11 +02:00
Laurent Destailleur
84e13c153d Merge pull request #5354 from atm-maxime/fix_travis 
FIX PHP 5.3 compatibility
 2016-06-16 20:07:59 +02:00
Drosis Nikos
5a51850d54 Greece VAT 23 -> 24 2016-06-16 14:03:11 +03:00
Laurent Destailleur
f94d140d2a Fix bad sql field name 2016-06-16 13:00:23 +02:00
Laurent Destailleur
9781baa743 FIX Filter on opportunity amount and budget 2016-06-16 12:42:21 +02:00
Maxime Kohlhaas
af5a75c39b Merge branch '3.9' of https://github.com/Dolibarr/dolibarr into 3.9 2016-06-15 18:25:45 +02:00
Laurent Destailleur
4c922f073b FIX Can't create thirdparty or validate invoice if profid is mandatory 
and profid does not exists for other countries
 2016-06-15 18:21:58 +02:00
Maxime Kohlhaas
748b3bb2ba Fix travis error for GETPOST in empty 2016-06-15 14:16:56 +02:00
Maxime Kohlhaas
f51386c59f FIX #5343 2016-06-15 08:06:22 +02:00
Frédéric FRANCE
3646b5f5ae Update import.php 2016-06-14 16:04:10 +02:00
Frédéric FRANCE
5234e8fc8f Update index.php 2016-06-14 15:32:55 +02:00
Laurent Destailleur
788c20516c Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-06-06 13:37:59 +02:00
Laurent Destailleur
e10db62b3a Fix a deadlock situation. If order set to billed by error, no way to 
solve situation.
 2016-06-06 13:29:37 +02:00
aspangaro
23b748aca3 Fix: Accountancy - Access rights 2016-06-05 14:22:13 +02:00
Maxime Kohlhaas
0ab4827091 FIX #5087 2016-06-05 02:06:32 +02:00
Laurent Destailleur
c07933729a Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-06-05 00:29:40 +02:00
Laurent Destailleur
c09dbe05b3 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/core/class/ldap.class.php
	htdocs/expensereport/card.php
	htdocs/langs/en_US/admin.lang
 2016-06-05 00:25:08 +02:00
Maxime Kohlhaas
a5472b58d1 FIX #5108 2016-06-05 00:24:00 +02:00
Laurent Destailleur
db2269b9dd Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/core/class/ldap.class.php
	htdocs/langs/en_US/admin.lang
 2016-06-05 00:12:34 +02:00
Maxime Kohlhaas
7866fb9dae Fix #5153 2016-06-04 19:11:32 +02:00
Maxime Kohlhaas
abe84ef991 Fix rights check on expense reports 2016-06-04 18:32:00 +02:00
Maxime Kohlhaas
3ef9fe2c40 Fix product supplier price modification with multicompany 2016-06-04 18:10:40 +02:00
phf
a62f5bd5b4 Fix #2777 2016-06-04 17:17:22 +02:00
phf
8ccda16ef3 Fix call function ldap_connect but not exists 2016-06-04 14:50:32 +02:00
Maxime Kohlhaas
bd2fe75d08 Fix menus in dashboard links 2016-06-04 14:45:03 +02:00
phf
01b881a0a6 Fix builddoc with odt lost value of extrafields as "sellist" on view card 2016-06-04 13:24:42 +02:00
Laurent Destailleur
5a105b75ec Merge pull request #5276 from atm-maxime/fix_import_mapping 
FIX #5229
 2016-06-04 11:35:27 +02:00
Juanjo Menent
43d475aa42 Merge pull request #5272 from simnandez/3.9 
Fix issues with strict mode
 2016-06-04 10:07:01 +02:00
Laurent Destailleur
c9834117c9 Fix #5156 2016-06-04 02:03:30 +02:00
Laurent Destailleur
32b6766a7d FIX #5195 2016-06-04 01:50:01 +02:00
Maxime Kohlhaas
a1c7632a50 Fix import mapping #5229 2016-06-04 01:28:51 +02:00
Laurent Destailleur
ff6daebee6 FIX #5203 2016-06-04 01:19:27 +02:00
Laurent Destailleur
085fa6902b Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/contrat/list.php
	htdocs/fourn/ajax/getSupplierPrices.php
 2016-06-04 00:58:16 +02:00
Laurent Destailleur
609cc1dd70 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-06-04 00:53:09 +02:00
Laurent Destailleur
9c3365aefc FIX #5163 2016-06-04 00:52:55 +02:00
Maxime Kohlhaas
8901b99e2d Fix import model not correctly saved #5185 2016-06-04 00:14:08 +02:00
Laurent Destailleur
b47db3e9e1 Merge pull request #5266 from atm-maxime/fix_project_time_spent_access 
Fix access to project task time spent creation #5249
 2016-06-04 00:13:32 +02:00
Juanjo Menent
66c73015b2 Fix issues with strict mode 2016-06-03 23:58:54 +02:00
Maxime Kohlhaas
8b0b3b1a9d PMP available only if stock module enabled 2016-06-03 23:49:34 +02:00