lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
66,491 Commits 43 Branches 150 Tags 886 MiB
2f19ba11e5
Commit Graph

66491 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
2f19ba11e5
Merge pull request #8637 from hregis/develop_ticket 
Fix: dolibarrize
 2018-04-20 01:22:19 +02:00
Laurent Destailleur
788fd62205
Merge pull request #8636 from hregis/develop_pgsql 
Fix: avoid Warning: A non-numeric value encountered + wrong var name
 2018-04-20 01:20:19 +02:00
Laurent Destailleur
bb5d3ee47e
Merge pull request #8635 from aspangaro/8.0-a23 
Accountancy - move to loadLangs
 2018-04-20 01:19:51 +02:00
Laurent Destailleur
7baf0eddbc NEW Add hidden option COMPANY_AQUARIUM_CLEAN_REGEX to clean generated 
accounting account.
 2018-04-20 01:10:57 +02:00
Laurent Destailleur
4ce313d864 NEW Can filter on country and taxid into the binding page 2018-04-19 23:52:37 +02:00
Laurent Destailleur
99feaf5275 Fix reposition class 2018-04-19 21:33:26 +02:00
Laurent Destailleur
16e27a445b Sort type of email template combo list 2018-04-19 20:42:03 +02:00
Laurent Destailleur
17dd96ef31 Fix filter on email template 2018-04-19 20:17:54 +02:00
Laurent Destailleur
1389ce9e48 FIX Template of modules not enabled must not be visible 2018-04-19 20:12:43 +02:00
Laurent Destailleur
558bda5f27 Fix translation of extrafields 2018-04-19 17:45:00 +02:00
Regis Houssin
8977a9b7aa Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_ticket

Conflicts:
	htdocs/public/ticketsup/create_ticket.php
	htdocs/public/ticketsup/list.php
 2018-04-19 16:42:00 +02:00
Laurent Destailleur
555c5f29e1 Ticket debug 2018-04-19 16:04:08 +02:00
Regis Houssin
5b79b76685 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_ticket

Conflicts:
	htdocs/core/class/html.formticketsup.class.php
 2018-04-19 15:58:14 +02:00
Laurent Destailleur
0358e0f29f Debug ticketsup 2018-04-19 15:11:26 +02:00
Laurent Destailleur
8acc752195 Debug ticket module 2018-04-19 14:44:21 +02:00
Laurent Destailleur
8aab183567 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-19 14:00:18 +02:00
Laurent Destailleur
fc167612c2 NEW class reposition can also work on POST (not only GET) 2018-04-19 13:59:20 +02:00
Laurent Destailleur
b1ea34f4e7 FIX DOL_AUTOSET_COOKIE was not correctly setting value of cookie 2018-04-19 13:54:43 +02:00
Laurent Destailleur
4472234637 Can set email in dol_print_error_email 2018-04-19 12:12:54 +02:00
Laurent Destailleur
d8e05c90f7 Can set email in dol_print_error_email 2018-04-19 12:12:19 +02:00
Laurent Destailleur
0f16ccbc4a Enhance dol_encode/dol_decode function 2018-04-19 12:03:42 +02:00
Laurent Destailleur
41be1c3d3d Removed deprecated class (method setCookie already exists for that) 2018-04-19 10:22:08 +02:00
Laurent Destailleur
1dc466e1fb FIX CVE-2018-10095 2018-04-18 12:32:19 +02:00
Laurent Destailleur
7ade4e37f2 FIX CVE-2018-10094 2018-04-18 12:23:49 +02:00
Laurent Destailleur
6b3e5e2085 FIX sanitize setup params 2018-04-18 12:19:23 +02:00
Laurent Destailleur
5d121b2d3a FIX CVE-2018-10092 2018-04-18 11:58:36 +02:00
Laurent Destailleur
fb3cae9ad3 Fix translation of country for GB 2018-04-18 11:36:44 +02:00
Regis Houssin
a4cd087df0 Fix: some bugs 2018-04-18 10:30:03 +02:00
Regis Houssin
ff76e60c49 Fix: some bugs and warnings 2018-04-18 10:13:20 +02:00
Regis Houssin
d6680b982a Fix: file not physically removed 2018-04-18 09:42:29 +02:00
Regis Houssin
d841abd55a Fix: missing value when reload 2018-04-18 09:37:29 +02:00
Regis Houssin
85c93c26a9 Fix: dolibarrize 2018-04-18 09:27:54 +02:00
Regis Houssin
eaecf7190a Fix: avoid Warning: A non-numeric value encountered + wrong var name 2018-04-18 08:34:48 +02:00
Alexandre SPANGARO
fd7bc2e607 Accountancy - move to loadLangs 2018-04-18 06:20:34 +02:00
Laurent Destailleur
7256edc831 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-18 03:28:50 +02:00
Laurent Destailleur
bbfc4a3e17 NEW Look and feel v8 - Show Picto "+" on all links "Add record" 2018-04-18 03:26:15 +02:00
Laurent Destailleur
46d28acb44 Look and feel v8 2018-04-18 02:10:23 +02:00
Laurent Destailleur
b39755f7b9 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-04-18 00:16:14 +02:00
Laurent Destailleur
013f95f54b Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-04-18 00:02:51 +02:00
Laurent Destailleur
e4635c9401 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-04-18 00:01:40 +02:00
Laurent Destailleur
963c5c2951 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-18 00:01:13 +02:00
Laurent Destailleur
c7789d2038 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-04-18 00:01:06 +02:00
Laurent Destailleur
a0f8aa50d5 CSS 2018-04-18 00:00:37 +02:00
Laurent Destailleur
5713a048fe
Merge pull request #8632 from aspangaro/8.0-a21 
Fix Accountancy
 2018-04-17 21:30:16 +02:00
Laurent Destailleur
d2d28ac851
Merge pull request #8629 from hregis/develop_pgsql 
Fix: correct syntax for postgresql
 2018-04-17 21:28:07 +02:00
Regis Houssin
ad197d01c1 Fix: avoid error 2018-04-17 21:16:17 +02:00
Regis Houssin
bab32e05e7 Fix: best practice for sequence 2018-04-17 21:08:40 +02:00
Laurent Destailleur
c551bf20e2 sys 2018-04-17 21:06:26 +02:00
Alexandre SPANGARO
e0c0f7fd9b Fix Accountancy 2018-04-17 20:04:55 +02:00
Regis Houssin
c07b5d684c Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_pgsql 2018-04-17 19:37:38 +02:00