lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
86,727 Commits 43 Branches 150 Tags 886 MiB
7b53ee2a6f
Commit Graph

86727 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
42d44e996f Fix link to setup page 2020-06-07 13:50:58 +02:00
Laurent Destailleur
04f68d25cd css 2020-06-07 01:34:26 +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
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
123265bf4c Fix redirect url in multilang 2020-06-06 20:37:17 +02:00
Laurent Destailleur
fb02edf254 Fix For select language component, we force on root 2020-06-06 20:25:05 +02:00
Laurent Destailleur
34778937c3 Fix link to image 2020-06-06 20:16:07 +02:00
Laurent Destailleur
2d87da8815 Fix link 2020-06-06 20:11:01 +02:00
Laurent Destailleur
f0892b08b8 Fix limit 2020-06-06 19:46:28 +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
Laurent Destailleur
36bc266d67 css 2020-06-06 17:33:26 +02:00
Laurent Destailleur
dd5b5e9bbf Fix lang suggested in clone of page 2020-06-06 17:12:37 +02:00
Laurent Destailleur
919cc0da87 Fix num payment 2020-06-06 15:39:18 +02:00
Laurent Destailleur
a305c43901 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/societe/card.php
	htdocs/ticket/card.php
 2020-06-06 11:51:39 +02:00
Laurent Destailleur
5dd9f4e4c4 Fix travis false positive 2020-06-06 11:36:24 +02:00
Laurent Destailleur
2344435416 Fix XSS CWE-ID CWE-79 2020-06-05 23:41:29 +02:00
Laurent Destailleur
4fcaaa3387 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-06-05 17:48:02 +02:00
Laurent Destailleur
ca3f62e4ac Doc repair Row size too large 2020-06-05 17:47:52 +02:00
Alexandre SPANGARO
e5f8f38fbf FIX: Accountancy - Binding index - Add a filter on sql request for module Subtotal & Jalon 2020-06-05 17:24:59 +02:00
Laurent Destailleur
d252248319 Fix back to link in ECM menu 
Fix picto in search_page
 2020-06-05 13:41:33 +02:00
Laurent Destailleur
b75700cc0b Fix virtualstock activation when MRP module is on 2020-06-05 10:27:34 +02:00
Laurent Destailleur
630525b59c css 2020-06-05 02:22:16 +02:00
florian HENRY
699557adbe forget[] 2020-06-04 21:39:23 +02:00
florian HENRY
afafe1a737 forget[] 2020-06-04 21:38:44 +02:00
florian HENRY
29649a1e2a Merge branch '11.0' of github.com:atm-florian/dolibarr into 11.0 2020-06-04 20:21:17 +02:00
stickler-ci
e9b17aac8d Fixing style errors. 2020-06-04 18:20:48 +00:00
florian HENRY
b47761e05c fix comment 2020-06-04 20:20:43 +02:00
florian HENRY
ca4a1dc266 Merge branch '11.0' of github.com:atm-florian/dolibarr into 11.0 2020-06-04 20:18:46 +02:00
florian HENRY
9a3e68b594 Merge branch '11.0' of github.com:Dolibarr/dolibarr into 11.0 2020-06-04 20:14:29 +02:00