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 |
|
Regis Houssin
|
a5814ce779
|
Fix: nocheck for "fournisseur", already check with "societe"
|
2018-02-09 11:00:43 +01:00 |
|
atm-ph
|
b074f580db
|
Fix can't update $nblignes on beforePDFCreation if we update $object->lines
|
2018-02-08 16:59:17 +01:00 |
|
Laurent Destailleur
|
39cd63e2d4
|
Merge pull request #8143 from simnandez/6.0
FIX: Withdrawals lines not filter by company name and not respect dropdown limit lines by page
|
2018-02-08 14:07:14 +01:00 |
|
Laurent Destailleur
|
371b168db1
|
Merge pull request #8133 from atm-quentin/6.0
FIX unset categorie
|
2018-02-08 13:09:52 +01:00 |
|
Laurent Destailleur
|
3f17c92aa3
|
Update card.php
|
2018-02-08 13:09:21 +01:00 |
|
Laurent Destailleur
|
c988d3f1cc
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
Conflicts:
htdocs/compta/facture.php
|
2018-02-08 12:53:26 +01:00 |
|
Laurent Destailleur
|
2e3bb4a585
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
|
2018-02-08 12:48:48 +01:00 |
|
Laurent Destailleur
|
414093f94f
|
Merge pull request #8155 from atm-ph/fix_6.0_pdf_writelinkedobjects_position
Fix position if module use pdf hook "linkedobjects"
|
2018-02-08 12:48:37 +01:00 |
|
Laurent Destailleur
|
8156374005
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
|
2018-02-08 12:45:30 +01:00 |
|
Laurent Destailleur
|
a26bb2d884
|
FIX #8151
|
2018-02-08 12:41:31 +01:00 |
|
atm-ph
|
6254e20c67
|
Fix position if module use pdf hook "linkedobjects"
|
2018-02-07 15:41:39 +01:00 |
|
Juanjo Menent
|
9b56555962
|
FIX: Withdrawals lines not filter by company name and not respect dropdown limit lines by page
|
2018-02-06 18:49:29 +01:00 |
|
atm-quentin
|
d989483d2b
|
Merge branch '60test' into 6.0
|
2018-02-05 16:10:40 +01:00 |
|
atm-quentin
|
783dc18cd0
|
Merge
|
2018-02-05 16:10:19 +01:00 |
|
atm-quentin
|
2081aefc84
|
FIX creer into lire
|
2018-02-05 16:07:08 +01:00 |
|
atm-quentin
|
bb93b98260
|
NEW field commerciaux and categ export CustomersInvoicesAndPayments
|
2018-02-05 15:25:49 +01:00 |
|
Laurent Destailleur
|
2d4624a1be
|
Merge pull request #8134 from hregis/6.0_multicompany
Fix: avoid error -1
|
2018-02-05 15:13:31 +01:00 |
|
Regis Houssin
|
839de65012
|
Fix: avoid error -1
|
2018-02-05 11:30:31 +01:00 |
|
atm-quentin
|
ae9c7ad6b6
|
FIX unset categorie
|
2018-02-05 10:40:52 +01:00 |
|
Laurent Destailleur
|
906a9eaa5a
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
|
2018-02-04 23:12:57 +01:00 |
|
Laurent Destailleur
|
dbe45d03d3
|
Fix: amount into form must be numeric without format
|
2018-02-04 23:12:19 +01:00 |
|