Commit Graph

54128 Commits

Author SHA1 Message Date
Laurent Destailleur
dcc1589d7c Merge pull request #5312 from aspangaro/4.0-p32
Loan - Debug & update
2016-06-07 00:28:20 +02:00
Laurent Destailleur
a8541fcaeb Merge pull request #5315 from atm-gauthier/develop_fix_usercard_link_on_deplacement
FIX : wrong id user deplacement links
2016-06-07 00:27:08 +02:00
Laurent Destailleur
645412517d css enhancement 2016-06-06 22:07:35 +02:00
Laurent Destailleur
cc8db0d0df FIX #2605 Request 4 - Missing last supplier proposal on thirdparty card. 2016-06-06 21:26:31 +02:00
aspangaro
a6a96c710d Restore note page 2016-06-06 20:36:04 +02:00
Laurent Destailleur
e47ca0b4c3 Enable new modules 2016-06-06 19:17:15 +02:00
Laurent Destailleur
2918dcfde4 Fix missing include 2016-06-06 17:25:44 +02:00
Laurent Destailleur
92da0cfe38 Fix text sticked on picto. 2016-06-06 17:21:18 +02:00
Laurent Destailleur
29fab54578 Fix box of last contracted contract (contract ref was not visible, label
was wrong).
2016-06-06 17:18:31 +02:00
Laurent Destailleur
559c1aa010 Fix alignetment of title in some arrays 2016-06-06 16:37:18 +02:00
Laurent Destailleur
fb13225173 Fix links on list from warnings dashboard 2016-06-06 16:31:50 +02:00
gauthier
b153ae8c6b FIX : wrong id user deplacement links 2016-06-06 16:12:27 +02:00
Laurent Destailleur
473ab18306 Fix link on workboard
Fix warning picto is missing on task list
2016-06-06 15:48:41 +02:00
Laurent Destailleur
0e06f116a2 Fix truncation of event conente in agenda view 2016-06-06 15:13:55 +02:00
Laurent Destailleur
47308d27c3 Missing column import_key and import for vat payments 2016-06-06 14:37:06 +02:00
Laurent Destailleur
4416925a85 Merge pull request #5314 from fmarcet/peru
Fix: Missing userid on query
2016-06-06 13:40:20 +02:00
Laurent Destailleur
293534273f Merge pull request #5313 from aspangaro/4.0-p33
Fix: colspan in vat list of payments
2016-06-06 13:39:07 +02:00
Laurent Destailleur
06b1336ba9 Merge pull request #5310 from aspangaro/4.0-p31
Fix: Accountancy - Right to access to fiscal year
2016-06-06 13:37:00 +02:00
Laurent Destailleur
1f93425193 Merge pull request #5308 from atm-maxime/develop
FIX #5044
2016-06-06 13:35:59 +02:00
Laurent Destailleur
52fefc2d02 Debug module resource 2016-06-06 13:14:05 +02:00
Laurent Destailleur
9b6e5196ea Debug module resource. Filter on agenda. 2016-06-06 13:05:36 +02:00
Laurent Destailleur
681249de8a Debug module resource 2016-06-06 12:29:15 +02:00
Your Name
68fa27ec03 Fix: Missing userid on query 2016-06-06 12:00:24 +02:00
Maxime Kohlhaas
fdfcc064dc Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2016-06-06 11:53:53 +02:00
Laurent Destailleur
9c88eadbe4 Fix: button to generate invoice manually must be disabled if we reach
max number of generation.
2016-06-06 11:48:39 +02:00
Laurent Destailleur
a0458be943 Fix object not defined 2016-06-06 11:25:54 +02:00
Laurent Destailleur
9eee61e6b7 Fix trans 2016-06-06 11:13:19 +02:00
Laurent Destailleur
51ce4804dd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-06-06 10:58:43 +02:00
Laurent Destailleur
ff23c825ae Code comment 2016-06-06 10:58:23 +02:00
Juanjo Menent
a7b0353317 Merge pull request #5307 from novalore/develop
english fix in accountancy for currency
2016-06-06 09:39:09 +02:00
aspangaro
e911b32b83 Fix: Loan - Totalpaid (Only the capital is deducted from the amount of loan to be paid off) 2016-06-05 16:15:04 +02:00
aspangaro
bfb212f61a Fix: Loan - Add dol_fiche 2016-06-05 16:08:40 +02:00
aspangaro
3b3567a718 Fix: colspan 2016-06-05 15:50:32 +02:00
aspangaro
bc92818c1a New: Loan - Show accounting account in card in view mode 2016-06-05 15:39:41 +02:00
aspangaro
fda07997d2 Fix: Loan - Remove page note, already present in card 2016-06-05 15:25:21 +02:00
aspangaro
1d5dd0d16e New: Loan - Add accountancy account list 2016-06-05 15:21:11 +02:00
aspangaro
466010a412 Fix: Accountancy 4.0 - Right to access to fiscal year 2016-06-05 14:14:20 +02:00
Maxime Kohlhaas
caaffdb0c3 FIX #5044 2016-06-05 02:54:25 +02:00
novalore
b52c441c64 english fix in accountancy for currency 2016-06-05 02:26:10 +02:00
Laurent Destailleur
248ac67af2 Fix php test 2016-06-05 02:24:31 +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
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
0d08231cd8 Merge pull request #5305 from atm-maxime/fix_ecm_removefile
FIX #5108
2016-06-05 00:29:22 +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
Laurent Destailleur
d9553212ac Merge pull request #5302 from atm-maxime/fix_sanitizefilename
FIX #5153
2016-06-05 00:08:30 +02:00
Laurent Destailleur
bbe5e398a5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-06-04 19:36:41 +02:00
Laurent Destailleur
147212437b FIX #4078 Edit inline of label of supplier invoice is ok. 2016-06-04 19:36:28 +02:00
Maxime Kohlhaas
7866fb9dae Fix #5153 2016-06-04 19:11:32 +02:00