Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-27 20:01:26 +01:00
Code Issues Packages Projects Releases Wiki Activity
72,072 Commits 36 Branches 191 Tags
afee39ea68ea5eaad940149d6bf0fad1294de229
Commit Graph

8469 Commits

Author SHA1 Message Date
Philippe GRAND
ae2df6be11 Standardize and Update code 2018-09-01 23:04:46 +02:00
Philippe GRAND
5d273960dc fix conflict 2018-09-01 22:40:38 +02:00
Laurent Destailleur
c8912d6a4f Merge pull request #9242 from frederic34/camelCaps 
mark non camelCaps function
 2018-09-01 15:37:56 +02:00
Philippe GRAND
f77dd2ebc7 Standardize and update code 2018-09-01 15:13:59 +02:00
Philippe GRAND
c013f9cf3d Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2018-09-01 15:13:04 +02:00
Laurent Destailleur
c2548b8b39 Merge pull request #9298 from ksar-ksar/Upd_hook_formConfirm 
NEW hook formConfirm always called if hooked
 2018-09-01 14:50:08 +02:00
Philippe GRAND
17e349eba2 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2018-09-01 14:27:53 +02:00
Laurent Destailleur
bcee0ef0ae Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/commande/dispatch.php
	htdocs/societe/class/societe.class.php
	htdocs/stripe/config.php
 2018-09-01 14:16:57 +02:00
Philippe GRAND
7b47c79bc3 precise label comment 2018-09-01 14:06:58 +02:00
Frédéric FRANCE
57fb3dc2f4 Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-09-01 13:52:51 +02:00
Philippe GRAND
7354e485b0 precise label comment 2018-09-01 13:22:08 +02:00
Philippe GRAND
1944ef0dc3 conflict resolution 2018-09-01 12:38:22 +02:00
Laurent Destailleur
b863b5176d Merge pull request #9322 from grandoc/new_branch_29_08_2018 
New branch 29 08 2018
 2018-09-01 12:11:01 +02:00
Philippe GRAND
bb05e80a87 Standardize and update code 2018-08-31 18:47:25 +02:00
Philippe GRAND
edaa575435 Standardize and update code 2018-08-31 18:36:15 +02:00
Philippe GRAND
2f307aae21 Standardize and update code 2018-08-31 18:06:17 +02:00
Philippe GRAND
9e880d3e72 Standardize and update code 2018-08-31 17:55:31 +02:00
Laurent Destailleur
6af8f8f475 Fix trans 2018-08-31 16:57:50 +02:00
Philippe Grand
b3c84ac3bc Merge branch 'develop' into new_branch_29_08_2018 2018-08-30 12:09:40 +02:00
Philippe GRAND
2e66c65650 WTF... 2018-08-30 12:03:20 +02:00
ksar-ksar
49d3bea192 Remove the test 
After discussion with Frederic, the best solution is to remove the test
 2018-08-30 11:27:48 +02:00
Frédéric FRANCE
6aee680a4f PSR2 ClassDeclaration 2018-08-29 22:06:05 +02:00
Frédéric FRANCE
b03f4004ea PSR2 FunctionClosingBrace 2018-08-29 21:25:22 +02:00
Frédéric FRANCE
cbdc669ba9 Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-29 18:45:36 +02:00
Frédéric FRANCE
7b2bfb28c2 Merge remote-tracking branch 'upstream/develop' into trimtrailing2 2018-08-29 12:48:12 +02:00
Philippe Grand
0ab593fdb1 Merge branch 'develop' into new_branch_29_08_2018 2018-08-29 12:47:01 +02:00
Philippe GRAND
4b7dd5ace3 Fix white spaces 2018-08-29 12:29:05 +02:00
Philippe GRAND
88ad651743 Fix white spaces 2018-08-29 12:26:47 +02:00
Philippe GRAND
e92b96acfd try to fix space errors 2018-08-29 12:00:53 +02:00
Laurent Destailleur
0eb4f8bb96 NEW Can set the datestart and dateend of cron job into module descriptor 2018-08-29 11:47:20 +02:00
Laurent Destailleur
b5c2383f65 Fix type of invoice encoded twice 2018-08-28 18:34:53 +02:00
Philippe Grand
b7bc34963a Update paymentsalary.class.php 2018-08-28 10:41:05 +02:00
Philippe Grand
1337d85a29 Update bankcateg.class.php 2018-08-28 10:40:41 +02:00
Philippe GRAND
65af8f902f Update and standardize code 2018-08-28 09:44:54 +02:00
Frédéric FRANCE
fe4260a014 Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-28 09:34:53 +02:00
Frédéric FRANCE
1182f29864 trimtrailing 2018-08-28 08:33:02 +02:00
Laurent Destailleur
7219bac0b2 Merge pull request #9168 from frederic34/trimtrailing 
Trimtrailing
 2018-08-28 02:30:02 +02:00
Laurent Destailleur
1842a4bb41 Merge pull request #9278 from grandoc/new_branch_21_08_2018 
Update and standardize code
 2018-08-28 02:13:28 +02:00
Frédéric FRANCE
d8bf4a0ecf Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-25 09:07:04 +02:00
ksar-ksar
a844855ade Update hook formConfirm 
The hook should be called when the $formconfirm is not empty
 2018-08-24 16:40:26 +02:00
Laurent Destailleur
32594e8048 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-08-24 10:47:10 +02:00
Laurent Destailleur
a82d86cec4 FIX warning for late template invoices to remove when suspended 2018-08-24 10:46:47 +02:00
Philippe GRAND
2fa82edd39 Standardize and update code 2018-08-23 17:07:27 +02:00
Philippe Grand
137b715868 Update deplacementstats.class.php 2018-08-22 22:28:33 +02:00
Philippe GRAND
504b0e3d16 Update and standardize code 2018-08-22 18:34:50 +02:00
Philippe GRAND
6542dcf0bd Update and standardize code 2018-08-22 12:04:50 +02:00
Philippe GRAND
e0462b975b Update and standardize code 2018-08-22 11:48:26 +02:00
Philippe GRAND
95349365ba Update and standardize code 2018-08-22 11:39:37 +02:00
Philippe GRAND
0ffad50974 Update and standardize code 2018-08-22 11:24:31 +02:00
Philippe GRAND
29f15b4ae6 Update and standardize code 2018-08-22 10:51:55 +02:00