Commit Graph

52901 Commits

Author SHA1 Message Date
Laurent Destailleur
a15a46449c Merge pull request #4910 from aspangaro/4.0-p11
NEW: Accountancy - Drop old table not used (Informations are already presents in llx_accounting_bookkeeping)
2016-03-30 14:00:50 +02:00
Laurent Destailleur
c730312a9f Merge pull request #4903 from aspangaro/4.0-p9
NEW: Accountancy - Add category
2016-03-30 13:58:37 +02:00
Laurent Destailleur
334cdbc2f5 NEW Option MAIN_LIST_FILTER_ON_DAY is supported on proposal list 2016-03-30 11:13:29 +02:00
Laurent Destailleur
e79633fa8d Fix search on supplier orders 2016-03-30 11:03:39 +02:00
Laurent Destailleur
abcbc5c0da Fix limit management 2016-03-30 10:45:14 +02:00
aspangaro
9cac252641 NEW: Accountancy - Drop old table not used (Informations are already presents in llx_accounting_bookkeeping) 2016-03-30 06:54:28 +02:00
aspangaro
ef03dc3454 Youps ! 2016-03-30 06:49:10 +02:00
aspangaro
26e017f4ef Merge remote-tracking branch 'Upstream/develop' into 4.0-p9
Conflicts:
	htdocs/accountancy/admin/card.php
2016-03-30 06:05:38 +02:00
Laurent Destailleur
0d9a86db3f Minor lool enhancement 2016-03-30 00:06:55 +02:00
Laurent Destailleur
ff96ebf381 Enahnce navigation 2016-03-29 22:09:13 +02:00
Laurent Destailleur
32080e99dd Fix dolistore url 2016-03-29 21:14:12 +02:00
Laurent Destailleur
b51bd74934 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-03-29 21:09:26 +02:00
Laurent Destailleur
83dd3081d5 FIX #4880. Lang should not be requied to fetch a user 2016-03-29 21:07:53 +02:00
Laurent Destailleur
61c0ee3c6c Merge pull request #4900 from aspangaro/4.0-p8
NEW: Accountancy Use clean_account to remove 0 at the right when we create an account in chart of accounts
2016-03-29 20:32:34 +02:00
Laurent Destailleur
12c8ed6cf0 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-03-29 20:21:19 +02:00
Laurent Destailleur
2e5cc98e59 Fix into badges visibility 2016-03-29 20:06:01 +02:00
aspangaro
c9271e04a0 Merge remote-tracking branch 'Upstream/develop' into 4.0-p9
Conflicts:
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
2016-03-29 19:54:41 +02:00
Laurent Destailleur
2e5b61dac7 Merge pull request #4909 from dzroot/patch-1
Update llx_20_c_departements.sql
2016-03-29 19:44:40 +02:00
Laurent Destailleur
3142fd3d84 Merge pull request #4899 from aspangaro/4.0-p7
Correct problem of merging with my last commits
2016-03-29 19:41:50 +02:00
Laurent Destailleur
718e9a7226 Filter on module origin 2016-03-29 19:18:53 +02:00
Laurent Destailleur
f4bea56a91 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-03-29 19:18:31 +02:00
Laurent Destailleur
39c18c37b3 Merge pull request #4898 from defrance/patch-115
Add photo on contact
2016-03-29 19:18:02 +02:00
Laurent Destailleur
4d37c47990 NEW Can select language from combo list on page to overwrite a
translation
2016-03-29 18:05:03 +02:00
AbdelHakim ALLAL
ed0fd32d15 Update llx_20_c_departements.sql
Correcting ALGERIA Provinces numbers
*Missing AL10
*Correcting the rest
2016-03-29 15:23:48 +01:00
Laurent Destailleur
98c2ba8c61 Normalize code 2016-03-29 15:41:46 +02:00
Laurent Destailleur
6b4909f802 Lost sort params 2016-03-29 15:31:52 +02:00
Laurent Destailleur
6188c3fced NEW Introduce a predefined job to run database backup 2016-03-29 14:52:27 +02:00
aspangaro
1f31163e5e Correct travis 2016-03-28 21:36:57 +02:00
aspangaro
2be979569d Debug II 2016-03-28 21:03:47 +02:00
aspangaro
cbecb37c59 debug 2016-03-28 15:32:57 +02:00
aspangaro
436fb91901 Uniformize name of table 2016-03-28 14:50:51 +02:00
aspangaro
8acf39cbb1 Uniformize name of table 2016-03-28 13:58:14 +02:00
aspangaro
432cc44ab6 NEW: Accountancy - Add category 2016-03-28 13:51:19 +02:00
aspangaro
98a46fd335 NEW: Accountancy Use clean_account to remove 0 at the right when we create an account in chart of accounts 2016-03-28 08:21:02 +02:00
aspangaro
85d51b0d6f Correct of problem of merging with my last commits 2016-03-28 07:46:55 +02:00
BENKE Charlie
34fb67fe99 Add contact photo 2016-03-26 18:12:03 +01:00
BENKE Charlie
962f0e33f7 Add : photo on contact 2016-03-26 18:05:09 +01:00
Laurent Destailleur
4145874d34 Better tranlsation message 2016-03-26 12:29:13 +01:00
Laurent Destailleur
f5de51406f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-03-26 12:28:38 +01:00
Laurent Destailleur
aab7575528 FIX Problem when disabling module product or service. They both include
same boxes, we must not disable box if the other is still active
2016-03-26 12:28:31 +01:00
Laurent Destailleur
40e0347bb5 More complete dependencies 2016-03-26 12:27:34 +01:00
Laurent Destailleur
0e9720a4b5 More complete dependencies 2016-03-26 12:26:27 +01:00
Laurent Destailleur
1d02f6446f FIX: Box must not visible of module it depends on are not enabled 2016-03-26 11:52:59 +01:00
Laurent Destailleur
22bed60a07 Remove manually other PR that should not be validated (travis errors
reported on PR with serious mysql error in migration due to use of
reserved keyword "range" as a name of a field).
2016-03-26 11:19:45 +01:00
Laurent Destailleur
01c2a831e2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-03-26 10:48:18 +01:00
Laurent Destailleur
de8ced6076 Test to find travis error 2016-03-26 10:48:07 +01:00
Laurent Destailleur
aee5f6dd2a Merge pull request #4894 from defrance/patch-114
FIX : Qual and some little fix
2016-03-26 10:27:50 +01:00
Juanjo Menent
dc491fbae9 Merge pull request #4887 from defrance/patch-111
NEW : INVOICE_CAN_NEVER_BE_CANCELED global
2016-03-26 09:51:36 +01:00
Laurent Destailleur
d213002892 FIX A not enabled field for list must not into fields to add 2016-03-25 19:42:42 +01:00
Laurent Destailleur
08e506874a FIX If thirdparty module not enabled, we must hide thirdparty info. 2016-03-25 19:42:14 +01:00