Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
79,034 Commits 36 Branches 189 Tags
fec67aade476d54d96db49b200bf53e0927e5eb0
Commit Graph

17941 Commits

Author SHA1 Message Date
Philippe GRAND
bba6669f03 Merge remote-tracking branch 'upstream/develop' into new_branch_05_10_2018 2018-10-09 08:47:26 +02:00
Laurent Destailleur
1c74dcc270 NEW Can filter on EEC, not EEC, etc... in binding step of accountancy 2018-10-09 01:47:37 +02:00
Laurent Destailleur
6ded9e843d NEW The binding step in accountancy has a country filter like a combo 2018-10-09 01:03:46 +02:00
atm-quentin
c6ab79bad3 NEW note, contact and lines on card 2018-10-08 16:54:33 +02:00
Laurent Destailleur
0c7b7ed7f4 FIX Required extrafield value numeric should accept '0' 2018-10-08 14:26:18 +02:00
Laurent Destailleur
7be9b6d94e Fix translation of source of proposals 2018-10-08 14:04:22 +02:00
Abbes Bahfir
f0d8a5da9a Fix: Reminder : TODO Add Javascript code to add input fields contents to new elements urls 2018-10-08 12:39:59 +01:00
Abbes Bahfir
7d25311ce5 New : Link to create new element on linked fields 2018-10-08 10:59:01 +01:00
Laurent Destailleur
08ca85e995 Fix type 2018-10-08 02:19:32 +02:00
Laurent Destailleur
df7f218d01 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-07 21:47:32 +02:00
Laurent Destailleur
d4b6429ccd Fix regression into backup feature 2018-10-07 21:45:20 +02:00
Laurent Destailleur
476aab9bae Same order than top menu 2018-10-06 21:00:26 +02:00
Laurent Destailleur
a0ba01321b Fix phpcs 2018-10-06 12:50:32 +02:00
Laurent Destailleur
ccc6dea85c Merge pull request #9686 from frederic34/patch-11 
PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
 2018-10-06 12:46:54 +02:00
Laurent Destailleur
f742b0f55b Merge pull request #9685 from frederic34/patch-9 
PSR2.Classes.ClassDeclaration.CloseBraceAfterBody
 2018-10-06 12:39:30 +02:00
Philippe GRAND
61daff6cb6 Standardize code 2018-10-06 12:34:51 +02:00
Philippe GRAND
83db36f9b2 Standardize code 2018-10-06 12:11:48 +02:00
Philippe GRAND
5583211246 Merge remote-tracking branch 'upstream/develop' into new_branch_05_10_2018 2018-10-06 12:00:24 +02:00
Laurent Destailleur
e24117e75b Fix position of modules is string on 2 digits 2018-10-06 11:57:53 +02:00
Philippe GRAND
fc4fea6f02 Merge remote-tracking branch 'upstream/develop' into new_branch_05_10_2018 2018-10-06 11:50:25 +02:00
Laurent Destailleur
d1dde0ffac Include rgpd module with name DataPolicies 2018-10-06 02:51:47 +02:00
atm-quentin
6a8092dfae NEW entete reception card 2018-10-05 16:21:50 +02:00
Philippe GRAND
94df8d297d Standardize code 2018-10-05 15:44:57 +02:00
Philippe GRAND
c7c3780400 clean code 2018-10-05 15:34:32 +02:00
Laurent Destailleur
5437c2ae85 Fix popup on img_picto 2018-10-05 14:32:19 +02:00
Laurent Destailleur
4e84ed0e80 FIX Symbol of currency in substitution variables 2018-10-05 13:59:46 +02:00
Laurent Destailleur
d1ad5dd4f1 FIX Symbol of currency in substitution variables 2018-10-05 13:58:38 +02:00
florian HENRY
cba4676032 Merge branch '7.0' of https://github.com/Dolibarr/dolibarr.git into 7.0_fix9161 2018-10-05 10:36:03 +02:00
florian HENRY
68c99d01a7 OMG!!!! var_dump.... 2018-10-05 10:35:32 +02:00
Frédéric FRANCE
2fc54ccf66 PEAR.NamingConventions.ValidFunctionName.NotCamelCaps 2018-10-04 20:23:58 +02:00
Frédéric FRANCE
48a063eca4 PSR2.Classes.ClassDeclaration.CloseBraceAfterBody 2018-10-04 20:18:24 +02:00
Laurent Destailleur
29cafc78d0 Merge pull request #9634 from grandoc/new_branch_29_09_2018 
add some significant info within notification mail
 2018-10-04 19:31:31 +02:00
Laurent Destailleur
4fad28d360 Update notify.class.php 2018-10-04 19:30:45 +02:00
Laurent Destailleur
2232bd3944 Update notify.class.php 2018-10-04 19:30:03 +02:00
Laurent Destailleur
6fcb45cf40 Rename page various_payment/index.php into list.php (coding rule) 2018-10-04 19:10:39 +02:00
Laurent Destailleur
3e36612a52 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-04 19:07:51 +02:00
Laurent Destailleur
5b350a0322 Use short label 2018-10-04 19:07:38 +02:00
Laurent Destailleur
20f45db6b8 Merge pull request #9677 from grandoc/new_branch_04_10_2018 
Standardize and update code
 2018-10-04 18:33:24 +02:00
Laurent Destailleur
ac86eac508 Merge pull request #9675 from atm-ph/fix_7.0_dom_error 
Fix minor error in dom
 2018-10-04 18:32:52 +02:00
Laurent Destailleur
ebba33635b Close #9674 by keeping old code present (this help for transition tests) 2018-10-04 18:20:57 +02:00
Laurent Destailleur
31916c94f0 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-04 17:57:20 +02:00
Laurent Destailleur
b3b2305651 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/core/lib/pdf.lib.php
 2018-10-04 17:56:56 +02:00
Laurent Destailleur
13759ea146 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture/class/facture.class.php
 2018-10-04 17:53:40 +02:00
Laurent Destailleur
3060647212 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/core/lib/pdf.lib.php
 2018-10-04 17:50:19 +02:00
Laurent Destailleur
8690d65479 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/core/lib/pdf.lib.php
 2018-10-04 17:47:22 +02:00
Laurent Destailleur
1c735ea6d5 Merge pull request #9673 from atm-florian/dev_resource 
NEW : add event tab on resource card
 2018-10-04 17:45:01 +02:00
Laurent Destailleur
2aca9cb394 Update company.lib.php 2018-10-04 17:44:47 +02:00
Laurent Destailleur
34f1691302 Merge pull request #9655 from frederic34/patch-11 
group same condition into one in html.formprojet.class.php
 2018-10-04 17:15:15 +02:00
Laurent Destailleur
111d589474 NEW Can mix offset before and after with rules for due date of invoices 2018-10-04 16:06:26 +02:00
Laurent Destailleur
75c968b4ae FIX Backup of database without mysqladmin available from cron. 2018-10-04 13:10:48 +02:00