Commit Graph

64295 Commits

Author SHA1 Message Date
Laurent Destailleur
2f68d446ef Fix on filter on project list 2017-07-31 04:52:27 +02:00
Laurent Destailleur
800aa4d5b6 Fix bad target 2017-07-31 04:49:54 +02:00
Laurent Destailleur
52875c08ff Fix missing translation keys 2017-07-31 04:24:13 +02:00
Laurent Destailleur
cfebbe3cc4 Fix css 2017-07-31 03:16:28 +02:00
Laurent Destailleur
7a69df08c5 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
Conflicts:
	htdocs/cron/class/cronjob.class.php
2017-07-31 02:39:42 +02:00
Laurent Destailleur
651bf525b0 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
Conflicts:
	htdocs/cron/class/cronjob.class.php
2017-07-31 02:37:28 +02:00
Laurent Destailleur
067e5d81d9 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2017-07-31 02:36:23 +02:00
Laurent Destailleur
69357dd91c Merge pull request #7113 from atm-ph/new_develop_expense_report
NEW Add expense report rules and ik
2017-07-31 02:33:49 +02:00
Laurent Destailleur
8c287174b0 Merge pull request #7215 from aspangaro/6.0-d1
Debug various_payment
2017-07-31 02:32:46 +02:00
Laurent Destailleur
4f0b35874d Merge pull request #7216 from atm-florian/fix_7213
FIX : #7213
2017-07-31 02:29:36 +02:00
Laurent Destailleur
b0adc9cca4 Merge pull request #7207 from atm-quentin/FIX_next_situation_load_extrafields
FIX next situation keep extrafields
2017-07-31 02:24:46 +02:00
Laurent Destailleur
d8121c133e Merge pull request #7205 from atm-quentin/6.0
FIX invoice situation division by zero
2017-07-31 02:23:37 +02:00
Laurent Destailleur
beaa5279ac Merge pull request #7197 from hregis/6.0_cron
Fix: add possibility to force entity id
2017-07-31 02:22:54 +02:00
Laurent Destailleur
cd6a3afc77 Merge pull request #7191 from hregis/4.0_bug3
Fix: run_jobs return always an error !!
2017-07-31 02:21:37 +02:00
Laurent Destailleur
eb27f8cfe8 Fix css 2017-07-31 02:18:33 +02:00
Laurent Destailleur
80f096a9d8 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-07-31 02:09:15 +02:00
Laurent Destailleur
1897e3cbad Some fix for better compatibility 2017-07-30 20:43:18 +02:00
Laurent Destailleur
bb8d458468 Fix menu editor 2017-07-30 19:41:45 +02:00
GUERRIER Kevin
b6b3ab3f1b NEW Add Next/Previous button on operation date of bank line
Operation date has to be frequently updated because some bank change them in many case. With this feature, this value can be updated simply like the value date.
2017-07-29 15:07:27 +02:00
GUERRIER Kevin
ded6b40489 Add possibility to propose last num releve in conciliation 2017-07-29 14:21:58 +02:00
Laurent Destailleur
837afa0e65 Fix better way to get info for contact/thirdparty on agenda 2017-07-29 04:07:46 +02:00
Laurent Destailleur
2a36166839 Fix error method on non object 2017-07-29 02:11:45 +02:00
Laurent Destailleur
cae21d3937 Fix in agenda output per user/type (reduce memory usage) 2017-07-29 01:59:26 +02:00
Laurent Destailleur
8b82fc3c70 Fix project edition on loan menu
Fix translation on profit view of projects.
2017-07-29 00:28:41 +02:00
Laurent Destailleur
af63dc76c1 Fix flex problems 2017-07-28 23:46:11 +02:00
Laurent Destailleur
5e17c2efb9 Fix into filters of time consumed 2017-07-28 23:32:55 +02:00
Laurent Destailleur
6253986ae5 Fix translation source 2017-07-28 23:32:29 +02:00
Laurent Destailleur
25c5ed8f72 Fix for compatibility 2017-07-28 18:09:38 +02:00
Laurent Destailleur
b0e62f9d24 Enhance image replacement 2017-07-28 17:17:40 +02:00
Laurent Destailleur
8bba9fa149 Factorize duplicate code 2017-07-28 15:32:15 +02:00
Laurent Destailleur
46586f3055 Can export Websites pages.
Work on export to be able to use the generic declaration of fields.
2017-07-28 14:54:13 +02:00
Laurent Destailleur
8d0f21866c Fix head instead of header 2017-07-28 13:05:24 +02:00
Laurent Destailleur
ef3c002144 Module website not stable enough 2017-07-28 12:37:52 +02:00
Laurent Destailleur
7d5c28b76f Fix website css edition 2017-07-28 12:11:20 +02:00
Laurent Destailleur
55a2e63c32 Revert "Fix include fails"
This reverts commit bfb904557f.
2017-07-28 12:07:05 +02:00
Laurent Destailleur
bfb904557f Fix include fails 2017-07-28 12:06:12 +02:00
Laurent Destailleur
cb5b0f3352 NEW Module "Product variants" is moved as stable. 2017-07-28 11:20:01 +02:00
Laurent Destailleur
f9442c1092 Fix box activity 2017-07-28 11:11:20 +02:00
Laurent Destailleur
60493d0a47 Several fixes (permission, missing method or class) in REST APIs 2017-07-28 11:03:30 +02:00
florian HENRY
f5718106a6 FIX : 7213 2017-07-28 09:45:23 +02:00
Alexandre SPANGARO
d8c6bc4a67 Fix: informations (Add account & correct tooltip) 2017-07-28 07:42:02 +02:00
Alexandre SPANGARO
5a932f993d Fix: function length_accountg has been moved in getNomUrl 2017-07-28 07:27:04 +02:00
Alexandre SPANGARO
0e23873945 Fix: SQL error in payment list 2017-07-28 07:18:41 +02:00
Alexandre SPANGARO
66067f980b Fix: cancel in create mode 2017-07-28 07:00:52 +02:00
Alexandre SPANGARO
95672e3bf0 Merge remote-tracking branch 'uptream/6.0' into 6.0-d1 2017-07-28 06:40:47 +02:00
Alexandre SPANGARO
0e86bfb6d4 Fix : delete function 2017-07-28 06:40:15 +02:00
Alexandre SPANGARO
fb4727c408 Add a specific entry in tax menu for various payment 2017-07-28 06:27:04 +02:00
Marc de Lima Lucio
2cb89b2d8b Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_price_formObjectOptions_hook 2017-07-27 17:16:58 +02:00
Marc de Lima Lucio
677d50df5b NEW: add 'formObjectOptions' hook to the form setting the product selling price 2017-07-27 17:11:15 +02:00
atm-ph
1f3f9e40b1 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_develop_expense_report 2017-07-27 16:01:53 +02:00