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

54808 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
BENKE Charlie
415bdbe9b5 Update html.formfile.class.php 2016-07-25 11:22:53 +02:00
BENKE Charlie
e948002353 New : edition feature on action/agenda 2016-07-25 11:21:00 +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
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
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
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
Laurent Destailleur
0428d9c887 Merge pull request #5525 from aspangaro/4.0-p36 
Fix: Presentation on thirdparty card
 2016-07-21 10:42:56 +02:00
Laurent Destailleur
2600b28638 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-07-21 10:40:29 +02:00
Laurent Destailleur
9f61fc4f5e Better translation 2016-07-21 10:40:13 +02:00
Laurent Destailleur
774e327831 Merge remote-tracking branch 'origin/3.9' into 4.0 
Conflicts:
	htdocs/comm/remx.php
	htdocs/compta/facture.php
	htdocs/langs/en_US/companies.lang
 2016-07-21 10:30:51 +02:00
Laurent Destailleur
972d998f7e Merge remote-tracking branch 'origin/3.8' into 3.9 2016-07-21 10:25:03 +02:00
Laurent Destailleur
9ebe704506 Merge pull request #5422 from atm-alexis/FIX_3.9_bug_5128 
FIX #5128 if create method return duplicated code error
 2016-07-21 09:55:26 +02:00
aspangaro
52e5403660 Fix: Presentation on thirdparty card 2016-07-21 06:25:25 +02:00
Laurent Destailleur
a290757d2d Merge pull request #5355 from atm-gauthier/NEW_allow_paiement_on_several_companies_bills_with_same_parentcompany 
NEW Option to allow payment on bills of different companies (with same parent company)
 2016-07-20 19:34:51 +02:00
Laurent Destailleur
e1f3b8e78f Code comment 2016-07-20 19:32:38 +02:00
Laurent Destailleur
548411a3fb Merge pull request #5364 from tysauron/patch-7 
FIX Simplification + get real DN of user from setup of key (multi d…
 2016-07-20 19:15:41 +02:00
Laurent Destailleur
34d1c0af72 Merge pull request #5321 from frederic34/patch-7 
Fix quotes not required on int
 2016-07-20 19:09:09 +02:00
Laurent Destailleur
a37caae098 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-07-20 19:01:55 +02:00
Laurent Destailleur
b90ed8d677 Merge pull request #5375 from frederic34/charges 
NEW select bank and payment mode for social contrib
 2016-07-20 19:00:10 +02:00
Laurent Destailleur
a75ea2bba6 Merge pull request #5169 from olsesacl/develop-change_fournisseurdet 
FIX: can use LINEORDER_SUPPLIER_CREATE
 2016-07-20 18:55:52 +02:00
Laurent Destailleur
adc9c28369 Merge pull request #5336 from atm-gauthier/develop_new_add_dorade_model 
New: Develop new add dorade model
 2016-07-20 18:31:47 +02:00
Laurent Destailleur
0ff6149741 Merge pull request #4673 from GPCsolutions/develop-forcedinstall 
New: Improved forced install process
 2016-07-20 18:27:39 +02:00
Laurent Destailleur
5a8c08e6cc Merge pull request #5481 from defrance/patch-12 
NEW Add hook "getnomurltooltip" to replace tooltips on getNomUrl functions
 2016-07-20 18:23:35 +02:00
Laurent Destailleur
abfa86d628 Merge pull request #5476 from defrance/patch-11 
NEW Display label and location of event on tooltip
 2016-07-20 18:20:27 +02:00