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

61560 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
atm-ph
ebb4da8417 Fix keep supplier proposal price in supplier order 2018-03-05 16:58:35 +01:00
atm-ph
d300b943e1 Fix wrong price on supplier order line 2018-02-23 15:10:25 +01:00
Laurent Destailleur
7f419a29e7
Merge pull request #8072 from laudeco/hotfix/8028_replacement_bill 
fix the bill replacement with discounts #8028
 2018-02-20 15:19:19 +01:00
Laurent Destailleur
01c2971f4f Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-02-20 15:08:17 +01:00
Laurent Destailleur
9690e68bfb
Merge pull request #8206 from fmarcet/5.0 
Fix: Barcode type on massive init
 2018-02-20 15:07:53 +01:00
Laurent Destailleur
b8736f5103 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-02-20 14:59:40 +01:00
Laurent Destailleur
a698ba0b56
Merge pull request #8205 from steschuser/5.0 
FIX: #8139 User search does not work if MAIN_USE_OLD_SEARCH_FORM, missing list.php
 2018-02-20 14:59:20 +01:00
Laurent Destailleur
85e5ac678f Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-02-20 14:56:17 +01:00
Laurent Destailleur
6c8e7494f0
Merge pull request #8200 from atm-maxime/fix_contact_tooltiip 
Fix contact tooltip
 2018-02-20 14:56:06 +01:00
Laurent Destailleur
276f2dce77 FIX #8200 2018-02-20 14:55:23 +01:00
Laurent Destailleur
67ee443b34 Fix can set holiday remaining to 0 2018-02-20 14:53:19 +01:00
Laurent Destailleur
4056b87a74 Fix syntax error 2018-02-20 12:36:03 +01:00
Laurent Destailleur
7321829732 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-02-20 12:34:15 +01:00
Laurent Destailleur
ea071b7680 Fix can't delete holiday refused 2018-02-20 12:31:26 +01:00
Ferran Marcet
671b4a399d Fix: Barcode type 2018-02-19 17:47:24 +01:00
Ferran Marcet
2e1727e323 Fix: Barcode type 2018-02-19 17:45:19 +01:00
Ferran Marcet
5535daf84a Merge branch '5.0up' into 5.0 2018-02-19 17:43:14 +01:00
sschwebel
7c583227fb FIX: #8139 2018-02-19 10:58:05 +01:00
Laurent Destailleur
033b898106
Merge pull request #8202 from atm-john/6.0_fix_invoice_extrafield_transmition_to_credit 
fix invoice extrafield transmition to credit
 2018-02-15 17:31:23 +01:00
John
49bad95d31 fix method exist test 2018-02-15 17:04:27 +01:00
John
63987fa32e fix invoice extrafield transmition to credit 2018-02-15 16:39:47 +01:00
Maxime Kohlhaas
bfd46f62ea Fix : contact and user getnomurl needs all info to display tooltip correctly 2018-02-15 15:18:25 +01:00
Maxime Kohlhaas
6fe69d4a60 Wrong field in thirdparty getnomurl 2018-02-15 15:17:59 +01:00
Laurent Destailleur
15ab37b46e Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-02-14 21:51:55 +01:00
Laurent Destailleur
b21feca9d7 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-02-14 21:51:35 +01:00
Laurent Destailleur
147b35d62e
Merge pull request #8194 from hregis/6.0_multicompany 
Fix: Update entity field in llx_user_rights and llx_usergroup_rights
 2018-02-14 21:31:02 +01:00
Laurent Destailleur
cf5c972c65
Merge pull request #8193 from atm-ph/fix_6.0_multicurrency_situation_invoice 
Fix apply global progress don't update multicurrency values
 2018-02-14 21:27:52 +01:00
Laurent Destailleur
483bfb096b
Merge pull request #8188 from atm-quentin/6.0_develop 
NEW Add sale representative einstein_pdf_modules
 2018-02-14 21:27:24 +01:00
Laurent Destailleur
c28d87252b
Merge pull request #8184 from laudeco/hotfix/8183_welcome_email_adherent 
Fix 8183 - adherent welcome e-mail edition always put 1 instead of keeping the e-mail
 2018-02-14 20:51:57 +01:00
Laurent Destailleur
d0fdf700d7
Update type.php 2018-02-14 20:51:33 +01:00
Laurent Destailleur
0d00c51c2a
Update type.php 2018-02-14 20:51:05 +01:00
Laurent Destailleur
94a76a1393
Merge pull request #8180 from atm-maxime/fix_service_list 
Fix : contract service list context was mixing up with service list from product/service module
 2018-02-14 20:43:03 +01:00
Laurent Destailleur
27c55635f3
Merge pull request #8164 from hregis/6.0_bug 
Fix: nocheck for "fournisseur", already check with "societe"
 2018-02-14 20:36:22 +01:00
Laurent Destailleur
23ee6748f7
Update fournisseurs.php 2018-02-14 20:36:13 +01:00
Regis Houssin
fa2fddcdc1 Fix: Update entity field in llx_user_rights and llx_usergroup_rights 2018-02-14 14:30:39 +01:00
atm-ph
c690dfb258 Fix apply global progress don't update multicurrency values 2018-02-14 10:15:38 +01:00
atm-quentin
144c13998a NEW_einstein_pdf_modules 2018-02-13 09:51:33 +01:00
De Coninck Laurent
1052213c97 Fix 8183 - adherent welcome e-mail 
Fix the adherent welcome e-mail.

[see: #8183]
 2018-02-12 18:12:43 +01:00
Maxime Kohlhaas
ef05171641 Fix : contract service list context was mixing up with service list from product/service module 2018-02-12 13:48:43 +01:00
Regis Houssin
24cc687724 Fix: you can't check "fournisseur" with checkUserAccessToObject without 
object ID
 2018-02-12 09:28:41 +01:00
Regis Houssin
448fcae02f Fix: move "fournisseur" in $checksoc 2018-02-12 09:03:53 +01:00
Regis Houssin
abb7e651d1 Merge branch '6.0' of https://github.com/Dolibarr/dolibarr.git into 6.0_bug 2018-02-12 09:02:12 +01:00
Laurent Destailleur
4d6f87e544
Merge pull request #8168 from simnandez/6.0 
Fix: Contracts not show price
 2018-02-12 03:13:31 +01:00
Laurent Destailleur
d731857fd0
Update linkedobjectblock.tpl.php 2018-02-12 03:13:12 +01:00
Laurent Destailleur
12f1e4c04b
Merge pull request #8167 from atm-john/fix_contract_line_extrafields_on_save 
Fix Missing insert of extrafields on contract add line
 2018-02-12 02:56:19 +01:00
Laurent Destailleur
d3d3bcaca5 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-02-12 02:53:21 +01:00
Laurent Destailleur
f88874c1f7 Code comment 2018-02-12 02:53:08 +01:00
Laurent Destailleur
5c59f5c63b
Merge pull request #8159 from atm-ph/fix_6.0_cant_update_nblignes_on_pdf_creation 
Fix can't update $nblignes on beforePDFCreation if we update $object->lines
 2018-02-12 02:34:52 +01:00
Juanjo Menent
67ce71bc48 Fix: Contracts not show price 2018-02-09 18:23:11 +01:00
John
2817ace0d2 Fix contract line extrafields save on add line 2018-02-09 15:47:18 +01:00