lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
54,836 Commits 43 Branches 150 Tags 886 MiB
e420a75fa0
Commit Graph

54836 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
florian HENRY
e420a75fa0 SQL query style 2016-07-26 09:01:28 +02:00
florian HENRY
419dd3095b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
dev_fix5353

Conflicts:
	htdocs/societe/class/societe.class.php
 2016-07-26 08:59:40 +02:00
Laurent Destailleur
f0a3a5ce02 NEW Mutualize mass action. So "Send by email" is also avavilable on 
orders.
 2016-07-25 21:50:41 +02:00
Laurent Destailleur
3265b7028d Merge remote-tracking branch 'origin/4.0' into develop 2016-07-25 19:53:28 +02:00
Laurent Destailleur
a0076bbabc Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-07-25 19:43:22 +02:00
Laurent Destailleur
a82e551a54 Start to work to mutualize code of mass actions 2016-07-25 19:43:07 +02:00
Juanjo Menent
437a8b53ae Merge pull request #5530 from GPCsolutions/forcedinstallfixes 
Forced install fixes
 2016-07-25 10:24:33 +02:00
Laurent Destailleur
834356b61e Fix missing opacity css 2016-07-24 22:24:18 +02:00
Laurent Destailleur
efe1cde388 More keywords in desc 2016-07-24 22:21:07 +02:00
Laurent Destailleur
4448c5e86f Removed "small" 2016-07-24 22:21:00 +02:00
Laurent Destailleur
23753d849c FIX Data not lost when error during creation of leave request. 
Conflicts:
	htdocs/holiday/define_holiday.php
 2016-07-24 22:20:21 +02:00
Laurent Destailleur
9661f08b38 Fix filter on dates of services 2016-07-24 22:17:46 +02:00
Laurent Destailleur
50f76cbb9c Fix bad css 2016-07-24 22:17:40 +02:00
Laurent Destailleur
42fc6606f9 Fix filter on dates of services 2016-07-24 22:17:12 +02:00
Laurent Destailleur
43a7109c69 Fix bad css 2016-07-24 21:50:04 +02:00
Laurent Destailleur
60c71d88f7 Fix missing loading admin langs 2016-07-23 14:30:48 +02:00
Laurent Destailleur
59e9d7f397 Fix the repositioning works better with new system class="reposition" 
compared to old system (#tag)
 2016-07-23 13:41:06 +02:00
Laurent Destailleur
343561be7a Fix colspan 2016-07-23 13:37:17 +02:00
Laurent Destailleur
867a0072e3 Fix forcing on module setup was not working 2016-07-23 13:20:34 +02:00
Laurent Destailleur
1b9b4395b9 Fix lost translation keys 2016-07-23 13:07:34 +02:00
Laurent Destailleur
b085ce6916 Fix lost translation keys 2016-07-23 13:01:42 +02:00
Laurent Destailleur
07d0f457b4 Fix: files generated by mass action could not be loaded 2016-07-23 12:44:28 +02:00
Laurent Destailleur
9b17d8dcc3 Fix code lost 2016-07-23 12:24:26 +02:00
Laurent Destailleur
08d23b482b NEW Introduce mass action "delete" on sales orders. 2016-07-23 12:17:47 +02:00
Laurent Destailleur
02c573b3cc NEW Can filter on type of leave requests in list 2016-07-23 11:18:22 +02:00
Laurent Destailleur
9b8a710976 FIX Data not lost when error during creation of leave request. 2016-07-23 11:10:08 +02:00
Laurent Destailleur
9c89bc4095 Remove deprecated tables and code 2016-07-23 10:57:27 +02:00
Laurent Destailleur
f013656b02 Better error management 2016-07-23 10:25:31 +02:00
Raphaël Doursenaud
1cfa26d400
Fix HTML syntax for forced install process. 
Make sure we have a space between attributes.
 2016-07-23 02:01:57 +02:00
Raphaël Doursenaud
2c000c20da
Prevent PHP notice on unitialized variables. 
These variables are expected to be uninitialized when the forced install
process is not used.
 2016-07-23 02:01:49 +02:00
Laurent Destailleur
d7f557c7ed Remove warning 2016-07-22 18:34:50 +02:00
Laurent Destailleur
8cc8a3f064 More keywords in desc 2016-07-21 20:51:17 +02:00
Laurent Destailleur
6243efe592 Removed "small" 2016-07-21 20:50:46 +02:00
Laurent Destailleur
af09528738 NEW Add substitution key __DATE_YMD__, __DATE_DUE_YMD__, __AMOUNT__ and 
__AMOUNT_WO_TAX__ into emails templates.
 2016-07-21 20:45:30 +02:00
Laurent Destailleur
f90946dbde Fix test on eat and sell date 2016-07-21 19:12:05 +02:00
Laurent Destailleur
80d99651a4 Merge remote-tracking branch 'origin/3.9' into 4.0 
Conflicts:
	htdocs/product/stock/tpl/stockcorrection.tpl.php
 2016-07-21 18:49:10 +02:00
Laurent Destailleur
3a08a14d56 Merge remote-tracking branch 'origin/3.8' into 3.9 2016-07-21 18:45:53 +02:00
Laurent Destailleur
80354cd8d6 FIX Can correct stock of lot using eatby or sell by date 2016-07-21 18:43:44 +02:00
Laurent Destailleur
2d037eb34e FIX Direction of movement lost if an error occurs 2016-07-21 18:36:43 +02:00
Laurent Destailleur
441a8c4a74 FIX Can make a movement on "out of sell" products 2016-07-21 18:28:06 +02:00
Laurent Destailleur
42be661b1d Fix bad error message output 2016-07-21 17:36:59 +02:00
Laurent Destailleur
5749c1889d Fix bad error message output 2016-07-21 17:35:23 +02:00
Laurent Destailleur
73aeb9fcce Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-07-21 17:25:45 +02:00
Laurent Destailleur
5203ddc253 FIX Missing $user 2016-07-21 17:22:24 +02:00
Laurent Destailleur
b5334b47bd Code comment. Add missing translation keyword 2016-07-21 16:22:43 +02:00
Laurent Destailleur
93bb929219 Merge pull request #5405 from atm-florian/dev_new_password_extrafeilds_type 
NEW : Add new password extrafields type
 2016-07-21 14:01:07 +02:00
Laurent Destailleur
d71754f577 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-07-21 13:49:32 +02:00
Laurent Destailleur
058c431483 FIX The project was lost when creating the event "sent by email". Also, 
event company "create" was not tracked by default like others.
 2016-07-21 13:49:10 +02:00
Laurent Destailleur
2a6ab47689 NEW Can change thirdparty when cloning a project. 2016-07-21 12:47:56 +02:00
Laurent Destailleur
ff9b2803e7 Fix if previous percent not defined, we do not try to show previous 
percent.
 2016-07-21 12:15:53 +02:00