Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-22 01:11:21 +01:00
Code Issues Packages Projects Releases Wiki Activity
77,916 Commits 36 Branches 190 Tags
c72e7e6a973bcb58ffb51a22944b68f371769bc0
Commit Graph

9016 Commits

Author SHA1 Message Date
Laurent Destailleur
33dc2d5ec3 Sync lang 2016-06-17 19:29:58 +02:00
Laurent Destailleur
4ceba62116 Merge pull request #5320 from novalore/develop 
fixes and typos in en_US lang files
 2016-06-16 20:27:00 +02:00
Laurent Destailleur
3720c95a52 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2016-06-16 09:50:45 +02:00
Laurent Destailleur
2395099d0f Debug Oauth 2016-06-15 17:20:00 +02:00
gauthier
a0051a856a NEW : conf to allow payments on different thirdparties bills but same parent company 2016-06-15 17:10:42 +02:00
Laurent Destailleur
5b5b7a2bf9 FIX Bad value used for task warning delay 
FIX Compatibility datee and date_end for warning of tasks
 2016-06-15 14:05:48 +02:00
Laurent Destailleur
6034ba658c Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2016-06-10 18:59:05 +02:00
Laurent Destailleur
ccba65fe74 Clean dead code 2016-06-09 22:30:50 +02:00
Laurent Destailleur
f5d7c6fda5 Fix translation of desired stock (this is more clear) 2016-06-08 09:57:03 +02:00
novalore
54fbd2b23a fixes and typos in en_US lang files 2016-06-07 12:48:47 +02:00
Laurent Destailleur
cc8db0d0df FIX #2605 Request 4 - Missing last supplier proposal on thirdparty card. 2016-06-06 21:26:31 +02:00
Laurent Destailleur
47308d27c3 Missing column import_key and import for vat payments 2016-06-06 14:37:06 +02:00
Laurent Destailleur
9eee61e6b7 Fix trans 2016-06-06 11:13:19 +02:00
novalore
b52c441c64 english fix in accountancy for currency 2016-06-05 02:26:10 +02:00
Laurent Destailleur
293c8e145a Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/fourn/commande/card.php
	htdocs/imports/import.php
	htdocs/langs/en_US/admin.lang
 2016-06-05 02:20:27 +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
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
phf
c62a69ccc8 Merge branch 'fix_3.7_issue_2858' into develop 2016-06-04 18:54:55 +02:00
novalore
c5ed9e723f bills.lang: TIP payment fixed in en_US 2016-06-04 18:39:04 +02:00
phf
3cbbdf5e20 Fix #2858 2016-06-04 18:23:22 +02:00
novalore
5de8b6eee5 correction on banks.lang as mentioned in #5267 2016-06-04 18:04:49 +02:00
novalore
2d907bc727 miscellaneous lang fixes in en_US 2016-06-04 17:34:23 +02:00
novalore
dcd83c403b Fix #4968 2016-06-04 17:34:04 +02:00
phf
a62f5bd5b4 Fix #2777 2016-06-04 17:17:22 +02:00
Laurent Destailleur
054329c319 Merge pull request #5283 from novalore/develop 
en_US lang fixes again
 2016-06-04 14:34:15 +02:00
Laurent Destailleur
674164b71c Add a better explanation on job generation 2016-06-04 14:30:05 +02:00
novalore
d924be8b95 en_US lang fixes again 2016-06-04 14:21:21 +02:00
Maxime Kohlhaas
d777fca0b9 Warning messages after module activation and for user with no permission 2016-06-04 13:25:39 +02:00
Laurent Destailleur
bfb7923d4c Merge pull request #5268 from atm-ph/fix_multicurrency_conf 
Fix conf useful has been commented
 2016-06-04 11:37:01 +02:00
novalore
3ee8f931b4 other fixes in en_US lang files 2016-06-04 02:16:58 +02:00
Laurent Destailleur
c9834117c9 Fix #5156 2016-06-04 02:03:30 +02:00
phf
b000ccf2e2 Fix traduction for multicurrency module 2016-06-04 01:46:10 +02:00
Laurent Destailleur
b57476153f Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/admin/menus/edit.php
	htdocs/fourn/ajax/getSupplierPrices.php
	htdocs/societe/consumption.php
 2016-06-04 01:14:36 +02:00
Laurent Destailleur
b51c4ab57b Merge pull request #5275 from novalore/develop 
Miscellaneous typos and errors in en_US lang files
 2016-06-04 00:20:27 +02:00
novalore
e2ba9c72a8 French string in main.lang 2016-06-04 00:18:15 +02:00
novalore
1227ee5eb6 Miscellaneous typos and errors in en_US lang files 2016-06-04 00:14:56 +02:00
Laurent Destailleur
776118a152 FIX Translation of lithuania 2016-06-03 21:32:12 +02:00
Laurent Destailleur
ebd8f2cf86 Prepare 4.0 2016-06-02 13:33:22 +02:00
Laurent Destailleur
5106f40a56 Merge branch 'develop_NEW_decrease_stock_expedition_classify' of 
https://github.com/atm-alexis/dolibarr into
atm-alexis-develop_NEW_decrease_stock_expedition_classify

Conflicts:
	htdocs/expedition/class/expedition.class.php
 2016-06-02 11:23:49 +02:00
Laurent Destailleur
780d1628a9 Missing trans 2016-06-01 21:19:21 +02:00
Laurent Destailleur
7519c4a602 FIX Log of tax 
FIX Missing import key on social contributions and missing class to
manage type of social contributions.
 2016-06-01 13:24:27 +02:00
Laurent Destailleur
0d277083e6 Fix duplicate translation 2016-05-30 19:56:59 +02:00
Laurent Destailleur
3ddf427ff1 FIX Legal issue for GB. Add hidden option for this. 2016-05-30 00:52:16 +02:00
Laurent Destailleur
c653acd4ce Minor fixes 2016-05-27 14:56:59 +02:00
Laurent Destailleur
b410aa57b9 Fix: Fetching category on label is not enough. We must introduce type 2016-05-25 15:36:48 +02:00
Laurent Destailleur
b476153b8b Move POS at end of top menu 2016-05-25 00:02:48 +02:00
Laurent Destailleur
a587ba496c NEW Can select fields on supplier orders 2016-05-24 18:43:35 +02:00
Laurent Destailleur
7935967c62 Fix duplicate translation key 2016-05-21 12:30:58 +02:00
Laurent Destailleur
5fd64c81a6 Missing translation 2016-05-21 12:21:17 +02:00
Laurent Destailleur
fd38db388a Rename box into widget 2016-05-19 10:05:02 +02:00