Commit Graph

58100 Commits

Author SHA1 Message Date
phf
579d350599 Fix keep the standard behaviour 2017-02-09 17:41:06 +01:00
Laurent Destailleur
7dddba3e39 Add octicons 2017-02-09 14:42:15 +01:00
De Coninck Laurent
fa527ff4eb fix the card page generator 2017-02-09 13:10:32 +01:00
Laurent Destailleur
488d68113d Add total in the file integrity checker 2017-02-09 12:56:39 +01:00
Laurent Destailleur
6f3f0a826f Fix pad files 2017-02-09 11:24:01 +01:00
Laurent Destailleur
56d7fe1bf6 Pad files with https 2017-02-09 10:23:44 +01:00
Alexandre SPANGARO
5c9c761911 Fix : Bank account label not shown in dol_banner_tab 2017-02-09 05:58:39 +01:00
Laurent Destailleur
767e842c68 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-02-09 01:08:17 +01:00
Laurent Destailleur
fbe0b13706 Add parameter to set the url to use for the file integrity checker 2017-02-09 01:07:54 +01:00
Gustavo Novaro
febe95cd2e $db attributte now be protected 2017-02-08 20:27:14 -03:00
Gustavo Novaro
f8a6d60fe5 $db attibute now be protected. 2017-02-08 20:24:20 -03:00
Ion
2418754d71 Fill oldline in supplier order updateline 2017-02-08 23:27:58 +01:00
Gustavo Novaro
a8c5661cb7 Code style
Set public and private
2017-02-08 17:36:04 -03:00
Gustavo Novaro
e053308c6f Code style
var to public
2017-02-08 17:24:11 -03:00
Gustavo Novaro
5a7c20e897 Code style
var to public
2017-02-08 17:13:54 -03:00
Gustavo Novaro
8d00297509 Move php values to js call
Not inside js declaration
2017-02-08 16:11:31 -03:00
Laurent Destailleur
5d94c8ddac Merge pull request #6403 from laudeco/feature/expense_report_wrong_placement
[FIX] - Expense report on multiple page
2017-02-08 19:34:16 +01:00
De Coninck Laurent
04d73668cc fix correct url for expense report note in expense report list 2017-02-08 19:28:01 +01:00
Laurent Destailleur
366df59658 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-02-08 19:25:41 +01:00
Laurent Destailleur
8ba544fba5 Merge pull request #6402 from laudeco/bugfix/er_fix_access_to_note
[FIX] Expense report, fix access to notes from list
2017-02-08 19:25:27 +01:00
Laurent Destailleur
ad361d6d45 Merge pull request #6394 from aspangaro/6.0-fiscalyear
[FP17] Accountancy - Prepare fiscal year
2017-02-08 19:25:02 +01:00
Laurent Destailleur
e74927a54c Merge pull request #6400 from atm-florian/4.0
FIX #6234
2017-02-08 19:22:46 +01:00
Laurent Destailleur
4d16540207 Merge pull request #6393 from aspangaro/6.0-export
NEW : [FP17] Accountancy - Add export of charts of accounts
2017-02-08 19:22:26 +01:00
Laurent Destailleur
88e2ee8492 Merge pull request #6401 from IonAgorria/syslog-delay
NEW: Show delay in syslog
2017-02-08 19:21:10 +01:00
De Coninck Laurent
439bda053d fix correct url for expense report note in expense report list 2017-02-08 19:18:16 +01:00
De Coninck Laurent
a042c30b28 fix nex line 2017-02-08 19:00:48 +01:00
Laurent Destailleur
6db0e909d6 Fix pagination 2017-02-08 18:41:23 +01:00
Ion
22b85b3aba Show delay in syslog 2017-02-08 17:30:51 +01:00
florian HENRY
ab0783edcc FIX #6234 2017-02-08 17:18:06 +01:00
Laurent Destailleur
596c092ec8 Merge pull request #6219 from atm-florian/dev_changelistchild
NEW : Allow extrafields list select to be dependands on other standard list and not only other extrafields list
2017-02-08 16:49:18 +01:00
Laurent Destailleur
f4e64685e8 Merge pull request #6397 from apachler/develop
added additional payment terms often needed in Austria
2017-02-08 16:47:40 +01:00
Laurent Destailleur
072fa9987b Update 4.0.0-5.0.0.sql 2017-02-08 16:47:27 +01:00
Laurent Destailleur
e0850b29cd Merge pull request #6399 from fappels/5.0
Qual reputation for price supplier
2017-02-08 16:42:20 +01:00
Laurent Destailleur
6fef6ac2fb Optimize code and performance of module variant 2017-02-08 14:07:54 +01:00
fappels
b1fe8e3f2b fix merge 2017-02-08 13:45:42 +01:00
fappels
a84c6f9b45 Qual reputation for price supplier
Move available reputation constants from view-controller to class
2017-02-08 13:35:34 +01:00
Andreas Pachler
c45b40075d fixed typos 2017-02-08 12:55:03 +01:00
Laurent Destailleur
d5b10a18b7 Debug module variant 2017-02-08 12:52:31 +01:00
Andreas Pachler
ae3ace7e94 added additional payment terms often needed in Austria 2017-02-08 12:46:42 +01:00
Laurent Destailleur
e1a6e6e4ab Rename "attributes" into "variants" to avoid confusion with extrafields 2017-02-08 12:37:38 +01:00
Laurent Destailleur
b24f244f67 Merge pull request #5533 from marcosgdf/prod-attr
Feature Request: NEW Added product attributes feature
2017-02-08 11:20:33 +01:00
Laurent Destailleur
b611c5ca53 Merge pull request #6054 from atm-gauthier/develop_NEW_reduc_on_excess_received
NEW Develop new reduc on excess received
2017-02-08 11:16:10 +01:00
Laurent Destailleur
104c8ae243 Merge pull request #6387 from aspangaro/5.0
Fix : Bank account ref not show in page accountancy admin journal. Complete informations for tooltip
2017-02-08 11:01:40 +01:00
Laurent Destailleur
882423f935 Merge pull request #6390 from fmarcet/3.9
Fix: Wrong vat calculation when split discounts
2017-02-08 11:01:08 +01:00
Laurent Destailleur
b250485efd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-02-08 11:00:19 +01:00
Laurent Destailleur
31c3398b7f Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/modules.php
2017-02-08 10:59:05 +01:00
Laurent Destailleur
dc0856413c Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-02-08 10:57:02 +01:00
Paris Liakos
eb452397bd Wrong trigger when setting supplier invoice back to draft 2017-02-08 10:56:28 +01:00
Laurent Destailleur
775cd8ca7d Merge pull request #6391 from ParisLiakos/develop
Wrong trigger when setting supplier invoice back to draft
2017-02-08 10:55:42 +01:00
Laurent Destailleur
4c3255857c Fix bad syntax into criteria to filter on date in export.
Fix missing type in export of invoices.
2017-02-08 10:45:20 +01:00