Commit Graph

50639 Commits

Author SHA1 Message Date
Laurent Destailleur
bf2af33b89 Merge pull request #4015 from ParisLiakos/develop
Add a trigger for product translation deletion
2015-11-21 00:19:40 +01:00
Laurent Destailleur
925b6a7c98 Merge pull request #4014 from frederic34/patch-8
Update list.php
2015-11-21 00:18:42 +01:00
Laurent Destailleur
5e0b5cb75d Merge pull request #4009 from frederic34/patch-7
Update list.php
2015-11-21 00:18:29 +01:00
Laurent Destailleur
e12760bb48 Merge pull request #3995 from frederic34/patch-5
Update list.php
2015-11-21 00:18:14 +01:00
Laurent Destailleur
552ecbcd95 Merge pull request #3964 from aspangaro/develop-hrm3
HRM : Work in progress
2015-11-21 00:14:41 +01:00
Laurent Destailleur
401b2a7389 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/theme/md/style.css.php
2015-11-20 23:47:07 +01:00
Laurent Destailleur
db27e08b7d Work on md style 2015-11-20 23:45:31 +01:00
Juanjo Menent
3094f9ed32 Merge pull request #4032 from grandoc/develop
[Qual] Uniformize code
2015-11-18 23:05:04 +01:00
Juanjo Menent
5218501c04 Merge pull request #4024 from defrance/patch-81
bad limittoshow usage
2015-11-18 22:31:57 +01:00
Juanjo Menent
9ecdfa8be8 Merge pull request #4017 from apachler/develop
added Regions, Departements and Forme Juridique for Austria
2015-11-18 22:04:19 +01:00
Frédéric FRANCE
dfdc220c6b Update list.php 2015-11-18 18:16:03 +01:00
Frédéric FRANCE
c647ad6425 Update list.php 2015-11-18 18:15:02 +01:00
Frédéric FRANCE
fe7cc95efd Update list.php 2015-11-18 18:13:19 +01:00
philippe grand
42ed3d2bb7 [Qual] Uniformize code 2015-11-18 16:05:41 +01:00
philippe grand
209ec62bfe Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop 2015-11-18 15:45:03 +01:00
Laurent Destailleur
735c7b7d68 Code comment 2015-11-18 13:57:01 +01:00
Laurent Destailleur
fbd1d2360f Comment 2015-11-18 13:42:38 +01:00
Laurent Destailleur
5c6f7425f1 FIX: List of user to assign a task is not visible 2015-11-18 13:23:01 +01:00
aspangaro
ad457b416d Use menu & add mode 'employee' in user/index.php 2015-11-17 22:51:34 +01:00
aspangaro
96d97657fd Remove obsolete code 2015-11-17 22:17:18 +01:00
aspangaro
258ac45519 Remove obsolete code 2015-11-17 22:14:39 +01:00
aspangaro
1f9960d1bb Remove info on employee card 2015-11-17 21:25:07 +01:00
aspangaro
c7df6c15a2 Different display if employee mode 2015-11-17 21:22:45 +01:00
aspangaro
b7b25c9682 Remove some code 2015-11-17 21:04:11 +01:00
aspangaro
a5ca6cb732 Merge remote-tracking branch 'Upstream/develop' into develop-hrm3 2015-11-17 20:34:37 +01:00
Laurent Destailleur
683ad24ece Take number of entry into top menu to defined the trigger to change size
of top menu thumbs
2015-11-17 19:16:40 +01:00
Laurent Destailleur
b1c5768de9 NEW Add fields into llx_cronjobs to be able to use job table to queue
one shot jobs.
2015-11-17 18:22:39 +01:00
BENKE Charlie
ce367bfa31 bad limittoshow usage
the value selected in MAIN_MAXTABS_IN_CARD is not well used (particulary when the active tab is present on tabcollector
2015-11-17 14:42:34 +01:00
Laurent Destailleur
6dc6bab556 Support of 'small', 'mini' and '' image size everywhere. 2015-11-17 10:38:00 +01:00
Laurent Destailleur
86db029cb3 Merge pull request #4013 from fappels/develop
Fix migration - remove default for text field
2015-11-17 10:06:07 +01:00
philippe grand
ce54d37956 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop 2015-11-17 09:33:20 +01:00
Andreas Pachler
161b75acfc added Regions, Departements and Forme Juridique for Austria 2015-11-17 06:56:49 +01:00
Laurent Destailleur
c6e7413349 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-11-17 00:58:22 +01:00
Laurent Destailleur
f5631cac45 NEW Introduce property module_position so a module can decide where it
appears into list of modules.
2015-11-17 00:58:12 +01:00
Paris Liakos
fb6819764d Add PRODUCT_DEL_MULTILANGS trigger for translation deletion on product 2015-11-17 01:20:58 +02:00
Laurent Destailleur
a8bfa1a258 Merge pull request #4011 from ParisLiakos/develop
Add triggers for product and category translation changes
2015-11-16 23:50:18 +01:00
Laurent Destailleur
dbf384ec6b Merge pull request #4000 from fmarcet/develop_bolivia
New: Bolivian regions and departments
2015-11-16 23:40:16 +01:00
Laurent Destailleur
66f24ff400 Merge pull request #3983 from grandoc/develop
[Qual] Uniformize code
2015-11-16 23:31:40 +01:00
Laurent Destailleur
2fbb030d61 Merge pull request #3984 from frederic34/warehouse
Select warehouse on order card
2015-11-16 23:31:25 +01:00
Laurent Destailleur
de70321149 Merge pull request #3982 from frederic34/imgstatut
Add statut2 icon and adjust some other
2015-11-16 23:30:49 +01:00
Frédéric FRANCE
59dd1502de Update list.php 2015-11-16 21:29:39 +01:00
fappels
e9be3d19f4 Fix migration - remove default for text field
remove default for user_param value text field
lang typo
2015-11-16 21:24:08 +01:00
Paris Liakos
146aa7815b Add X_SET_MULTILANGS triggers to make possible reacting on translation changes for products and categories 2015-11-16 20:27:51 +02:00
fappels
37c41b2124 Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop 2015-11-16 16:51:20 +01:00
fappels
e4b821c266 Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop 2015-11-16 16:44:24 +01:00
Frédéric FRANCE
0424a2bb3d Update list.php 2015-11-16 16:27:37 +01:00
fmarcet
9e51cf66dd New: Bolivian regions and departmens 2015-11-16 12:34:59 +01:00
philippe grand
f190e5f931 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop 2015-11-16 08:48:07 +01:00
Frédéric FRANCE
ba60313f88 Update list.php 2015-11-16 00:11:03 +01:00
Laurent Destailleur
dfc01e971f Update files for transifex sync 2015-11-15 20:27:43 +01:00