Commit Graph

89109 Commits

Author SHA1 Message Date
Laurent Destailleur
2a1d547267 Celan dead code 2020-06-07 18:44:37 +02:00
Laurent Destailleur
4020d97362 FIX Can create a credit note on situation invoice if previous is also
credit note
2020-06-07 18:36:58 +02:00
Laurent Destailleur
180a0a4557 Info for debug 2020-06-07 18:30:46 +02:00
ptibogxiv
37007d6d1a
Update subscription.class.php 2020-06-07 16:12:28 +02:00
Marc Guenneugues
bd12972d7b replenish : select expedition quantities only from opened orders when using virtual stocks 2020-06-07 14:14:11 +02:00
Vaadasch
7b53ee2a6f Update byratecountry.php
Add "cc.code" in the "GROUP BY" clause. Error in PGSQL if absent.
Add ORDER BY country / product_type / vatrate
2020-06-07 14:13:57 +02:00
Laurent Destailleur
80e06bdbda
Merge pull request #14049 from Vaadasch/patch-2
Update byratecountry.php
2020-06-07 14:13:30 +02:00
Laurent Destailleur
e17818c3dd
Merge pull request #14048 from simicar29/11.0-replenish
replenish : select expedition quantities only from opened orders when…
2020-06-07 14:12:38 +02:00
Laurent Destailleur
42d44e996f Fix link to setup page 2020-06-07 13:50:58 +02:00
Laurent Destailleur
f2e54b9ad5 Fix link to setup page 2020-06-07 13:49:49 +02:00
Laurent Destailleur
04f68d25cd css 2020-06-07 01:34:26 +02:00
Laurent Destailleur
4169aa716c FIX can install module even if (x) was appended during download. 2020-06-07 00:23:20 +02:00
Laurent Destailleur
7d3039d41f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/langs/en_US/admin.lang
	htdocs/user/card.php
2020-06-06 23:04:55 +02:00
Laurent Destailleur
19405d5f5b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/langs/en_US/admin.lang
2020-06-06 23:02:05 +02:00
Laurent Destailleur
cbafbe16a2 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/accountancy/customer/index.php
	htdocs/accountancy/supplier/index.php
	htdocs/admin/mails_templates.php
	htdocs/core/class/html.form.class.php
	htdocs/core/class/html.formticket.class.php
	htdocs/langs/en_US/admin.lang
2020-06-06 23:00:24 +02:00
Laurent Destailleur
115b827115 Prepare v12 2020-06-06 22:52:36 +02:00
Laurent Destailleur
e9a0b0c290
Merge pull request #14029 from atm-maxime/fix_user_validator_test
Fix missing test on module enabled for user validators
2020-06-06 22:23:30 +02:00
Laurent Destailleur
30ea9a497d
Merge pull request #14030 from atm-maxime/fix_contact_update_socialnetworks
Fix #14027 : emptying social network value on contact wasn't working
2020-06-06 21:57:32 +02:00
Laurent Destailleur
b221c65165 Merge 2020-06-06 21:56:23 +02:00
Laurent Destailleur
b386400365 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-06-06 21:52:55 +02:00
Laurent Destailleur
d7bd7371a6
Merge pull request #13973 from atm-florian/11.0
FIX : #13968
2020-06-06 21:48:26 +02:00
Laurent Destailleur
261d0772f8
Update commonobject.class.php 2020-06-06 21:47:27 +02:00
Laurent Destailleur
38d95aa5cd
Update societe.class.php 2020-06-06 21:45:53 +02:00
Laurent Destailleur
bb192195f1
Update commonobject.class.php 2020-06-06 21:41:33 +02:00
Laurent Destailleur
87806346c7
Update commonobject.class.php 2020-06-06 21:40:20 +02:00
Laurent Destailleur
d9ac7ab9da
Update commonobject.class.php 2020-06-06 21:37:53 +02:00
Laurent Destailleur
af440b7c49
Update societe.class.php 2020-06-06 21:32:25 +02:00
Laurent Destailleur
a66926cf08
Update commonobject.class.php 2020-06-06 21:30:08 +02:00
Laurent Destailleur
4f2af3bf67
Merge pull request #14021 from atm-gauthier/10.0_fix_modelmail_tickets
FIX : Tickets mail models doesn't work
2020-06-06 21:24:04 +02:00
Laurent Destailleur
30c6ae394b
Update html.formticket.class.php 2020-06-06 21:23:35 +02:00
Laurent Destailleur
cd8dd236f4
Merge pull request #14028 from aspangaro/10.0_p38
FIX: Show ref_customer, amount on contract link object
2020-06-06 21:22:11 +02:00
Laurent Destailleur
a5b74189e6
Merge pull request #14031 from atm-florianm/10.0_FIX_copy_payment_value_date_on_account_line
FIX: copy value date of VariousPayment onto the new AccountLine
2020-06-06 21:19:11 +02:00
Laurent Destailleur
f30b522ab6
Merge pull request #14035 from OPEN-DSI/new-takepos-terminal-free-text
NEW add free text on each terminal of cash desk
2020-06-06 21:10:56 +02:00
Laurent Destailleur
f19064abfa
Merge pull request #14044 from dolibit-ut/patch-29
create index.html
2020-06-06 21:08:11 +02:00
Laurent Destailleur
2140f05eb4
Merge pull request #14040 from aspangaro/10.0_p40
FIX: Accountancy - Binding index - Add a filter on sql request for module Subtotal & Jalon
2020-06-06 21:01:40 +02:00
Laurent Destailleur
4e4e7a38c3
Merge pull request #14041 from bb2a/VCARD
NEW add vcard for aderent and user
2020-06-06 20:58:37 +02:00
Laurent Destailleur
233810d41d Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-06 20:37:36 +02:00
Laurent Destailleur
123265bf4c Fix redirect url in multilang 2020-06-06 20:37:17 +02:00
Laurent Destailleur
148bdec96f Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-06 20:25:24 +02:00
Laurent Destailleur
fb02edf254 Fix For select language component, we force on root 2020-06-06 20:25:05 +02:00
Laurent Destailleur
788ec1f87d Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-06 20:18:51 +02:00
Laurent Destailleur
34778937c3 Fix link to image 2020-06-06 20:16:07 +02:00
Laurent Destailleur
f00b2d1e6f Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-06 20:11:57 +02:00
Laurent Destailleur
2d87da8815 Fix link 2020-06-06 20:11:01 +02:00
Laurent Destailleur
f7fc89a9d2 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-06 19:46:59 +02:00
Laurent Destailleur
f0892b08b8 Fix limit 2020-06-06 19:46:28 +02:00
Laurent Destailleur
88aaec63f7 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-06 18:57:41 +02:00
Laurent Destailleur
7061e9b4cb Fix deletion of website page 2020-06-06 18:57:24 +02:00
Laurent Destailleur
e31e889595 Add url in error message 2020-06-06 18:30:04 +02:00
florian HENRY
0943b13ecc Merge branch '11.0' of github.com:Dolibarr/dolibarr into 11.0 2020-06-06 17:51:31 +02:00