Commit Graph

58547 Commits

Author SHA1 Message Date
Laurent Destailleur
aca1c1944d Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/install/mysql/data/llx_c_action_trigger.sql
2017-03-30 12:02:27 +02:00
Laurent Destailleur
141ef91dea Fix default auto events 2017-03-30 11:53:58 +02:00
Laurent Destailleur
ce7368d10e Fix events create from member card not linked to member 2017-03-30 11:51:07 +02:00
Laurent Destailleur
f01815519a Fix trigger of automatic events 2017-03-30 11:25:28 +02:00
Laurent Destailleur
78cc976e9f Work on module builder 2017-03-30 10:40:15 +02:00
Laurent Destailleur
4df8dcf980 Work on module modBlockedLog and modModuleBuilder 2017-03-29 21:50:15 +02:00
Laurent Destailleur
f194ba6e09 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-03-29 11:48:35 +02:00
Laurent Destailleur
fbca800246 FIX Detection of color brightness 2017-03-29 11:46:13 +02:00
Laurent Destailleur
1d6e760fc8 FIX Notification sending was broken. 2017-03-29 11:44:14 +02:00
Laurent Destailleur
e3d3d32b4a Translation 2017-03-29 11:11:37 +02:00
Laurent Destailleur
54b03a3552 Work on 6.0 new look and feel 2017-03-29 11:03:13 +02:00
Laurent Destailleur
4fa5448aab FIX Detection of color brightness 2017-03-29 10:34:33 +02:00
Laurent Destailleur
ad3b54b93a Fix regression 2017-03-28 21:09:15 +02:00
Laurent Destailleur
3d1ae236e1 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-03-28 21:05:27 +02:00
Laurent Destailleur
c84e20abaf Fix translation 2017-03-28 21:05:11 +02:00
Laurent Destailleur
e416ea275e Work on 6.0 look and feel 2017-03-28 21:04:38 +02:00
Laurent Destailleur
e8e7732820 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2017-03-28 17:41:41 +02:00
Laurent Destailleur
31bde1ae74 Code for 6.0 new look and feel 2017-03-28 17:12:15 +02:00
Laurent Destailleur
a663c248f0 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-03-28 13:31:44 +02:00
Laurent Destailleur
2f439fed85 Code for 6 2017-03-28 13:31:28 +02:00
Laurent Destailleur
997bc35d5f FIX #6586 2017-03-28 13:22:11 +02:00
Laurent Destailleur
6bf61c677f FIX #6586 Introduce processing status 2017-03-28 13:20:31 +02:00
Laurent Destailleur
41063e7cf2 Fix: trigger for delete must be before delete of element 2017-03-28 12:55:20 +02:00
Laurent Destailleur
75a86cd8e5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-03-28 12:48:23 +02:00
Laurent Destailleur
b5b0eba470 Several enhancement for 6.0 2017-03-28 12:47:48 +02:00
Laurent Destailleur
d788dc3aee Merge pull request #6596 from dolibarr95/patch-6
NEW : Create a trigger for company rib delete
2017-03-28 12:46:55 +02:00
Laurent Destailleur
90a90e1a3c FIX #6533 #6590 2017-03-28 12:45:09 +02:00
Laurent Destailleur
ede23aacc9 Merge pull request #6592 from aspangaro/5.0-p5
Fix : integration of expense report in accountancy bank journal
2017-03-28 12:40:40 +02:00
Laurent Destailleur
3740137e31 Add tooltip on label of each open item. 2017-03-28 10:44:52 +02:00
Laurent Destailleur
219bcb0d54 Work on 6.0 features. 2017-03-27 22:44:50 +02:00
dolibarr95
17e5279907 Create a trigger for company rib delete 2017-03-27 14:00:05 +02:00
Laurent Destailleur
0838953ef7 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-03-27 00:49:24 +02:00
Laurent Destailleur
f843f8a93d Start to move search bar before table titles 2017-03-27 00:48:50 +02:00
Alexandre SPANGARO
3148841ecf Fix : integration of expense report in accounatncy bank journal 2017-03-26 21:26:05 +02:00
Laurent Destailleur
9f0328ab7f Hidden for the moment because option specific to one theme only. 2017-03-26 13:11:01 +02:00
Laurent Destailleur
95fbe0147d Merge pull request #6585 from defrance/patch-99
display input border by setting
2017-03-26 13:06:48 +02:00
Laurent Destailleur
09e1583798 Merge pull request #6589 from aspangaro/5.0-p5
Fix : little problems in accountancy
2017-03-26 13:05:03 +02:00
Alexandre SPANGARO
0987f19707 Fix : Bad page title of bind card 2017-03-26 06:20:55 +02:00
Alexandre SPANGARO
8f915bc593 Fix : Problem with type_fees_label in accountancy module 2017-03-26 06:20:05 +02:00
Alexandre SPANGARO
3bde8a575e Fix : Ref of expense report and date are inverted in list of expense report to bind 2017-03-26 05:48:31 +02:00
Laurent Destailleur
ca3a39b71e Merge pull request #6588 from defrance/patch-100
Bad parasite caracters
2017-03-26 01:51:04 +01:00
Laurent Destailleur
ba59c27754 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-03-26 01:46:08 +01:00
Laurent Destailleur
9a85e5ef00 Enhance the file checker 2017-03-26 01:45:09 +01:00
BENKE Charlie
dfb24a13d9 Bad parasite caracters
TD not good
2017-03-25 23:48:30 +01:00
Laurent Destailleur
5b97736bb0 Merge pull request #6576 from defrance/patch-97
FIX : supplier default condition not retrived on create
2017-03-25 21:22:44 +01:00
Laurent Destailleur
edf28b59d6 Merge pull request #6571 from defrance/patch-94
display total line for all total line
2017-03-25 21:18:16 +01:00
Laurent Destailleur
0f883b44c0 Merge pull request #6582 from fappels/5.0_fix_6550
Fix issue #6550
2017-03-25 21:17:11 +01:00
Laurent Destailleur
8c2b70c4a7 Fix filechecker 2017-03-25 20:51:02 +01:00
BENKE Charlie
acfdc96121 Border input display is allowed by setting 2017-03-25 19:34:04 +01:00
BENKE Charlie
aa5ff36a04 display input border by setting 2017-03-25 19:04:27 +01:00