lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
72,072 Commits 43 Branches 150 Tags 886 MiB
afee39ea68
Commit Graph

5616 Commits

Author SHA1 Message Date
Laurent Destailleur
a546ef7f2d FIX default day 2018-09-19 20:01:25 +02:00
Laurent Destailleur
92aa6929de Fix go back on agenda view on correct page 2018-09-19 17:03:13 +02:00
Laurent Destailleur
824b572bd0 FIX Amount when using mutlicurrency on PDF 
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0

Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
 2018-09-19 15:03:24 +02:00
Frédéric FRANCE
1d43c6bc3a
call to deprecated add_object_linked was present two times 2018-09-19 10:57:59 +02:00
Laurent Destailleur
03928a914d
Merge pull request #9537 from frederic34/patch-20 
reduce complexity of actioncomm reminder class
 2018-09-18 15:08:46 +02:00
Frédéric FRANCE
beb7a0609c
reduce complexity of actioncomm reminder class 2018-09-16 19:06:21 +02:00
Frédéric FRANCE
7b37c41cfb
reduce complexity of actioncomm class 2018-09-16 19:04:43 +02:00
Laurent Destailleur
ab0f842db6 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-16 12:55:44 +02:00
Laurent Destailleur
74a9c680df FIX "Other ..." link so the "Back to" link works. 2018-09-16 12:27:56 +02:00
Laurent Destailleur
4efab446d0
Merge pull request #9508 from frederic34/patch-15 
reduce complexity of libstatut propal.class.php
 2018-09-15 17:24:59 +02:00
Laurent Destailleur
80fb1e0657 NEW Each user can set its prefered default calendar 2018-09-14 11:23:15 +02:00
Frédéric FRANCE
bcc9a3d259
reduce complexity of libstatut propal.class.php 2018-09-13 21:45:46 +02:00
Frédéric FRANCE
987fdbe73c
Merge remote-tracking branch 'upstream/develop' into patch-6 2018-09-12 21:29:41 +02:00
Frédéric FRANCE
3e71f4e6b0
Merge remote-tracking branch 'upstream/develop' into patch-6 2018-09-12 18:36:49 +02:00
Frédéric FRANCE
998b67fa98
Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-12 18:32:15 +02:00
Laurent Destailleur
6291f18179
Merge pull request #9440 from frederic34/patch-5 
Upper Lower Casing
 2018-09-12 18:24:02 +02:00
Laurent Destailleur
fcabe67e4b Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-12 13:30:28 +02:00
Frédéric FRANCE
f02b2f0239
Merge remote-tracking branch 'upstream/develop' into patch-6 2018-09-09 13:35:58 +02:00
Frédéric FRANCE
fa895b2c2d
replace select_date 2018-09-09 11:30:40 +02:00
Frédéric FRANCE
a558c3bdac
replace select_date 2018-09-09 11:25:59 +02:00
Frédéric FRANCE
8249756726
replace select_date 2018-09-09 10:40:00 +02:00
Frédéric FRANCE
14bc8ed18d
Update multiprix.php 2018-09-08 23:19:11 +02:00
Frédéric FRANCE
2b62c4ca8f
Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-08 10:50:27 +02:00
Philippe GRAND
97c740f510 Merge branch 'develop' of github.com:grandoc/dolibarr into develop 2018-09-06 19:28:10 +02:00
Laurent Destailleur
ff05997f0a FIX Several fixes on the management of minimal amount for orders 2018-09-06 17:37:02 +02:00
Frédéric FRANCE
4e619dd0ed
Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-05 18:51:21 +02:00
Frédéric FRANCE
aa74d2ac38
Update api_agendaevents.class.php 2018-09-04 23:53:37 +02:00
Laurent Destailleur
ab8155f170 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture/card.php
	htdocs/filefunc.inc.php
 2018-09-04 21:35:43 +02:00
Frédéric FRANCE
65b74ad30f
Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-04 20:48:35 +02:00
Philippe Grand
c32c67ca57
Merge branch 'develop' into develop 2018-09-04 16:58:59 +02:00
Philippe GRAND
707f8b7312 fix merge 2018-09-04 14:49:56 +02:00
Laurent Destailleur
3d50c454c1 Code comment 2018-09-03 17:05:44 +02:00
Philippe GRAND
7a0c19485e fix merge 2018-09-03 09:34:08 +02:00
Frédéric FRANCE
35232b753a
move phpcs:ignore 2018-09-02 20:37:12 +02:00
Frédéric FRANCE
03a5aba8a2
move phpcs:ignore 2018-09-02 18:49:23 +02:00
Frédéric FRANCE
e13a8ec572
Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-02 18:19:45 +02:00
Frédéric FRANCE
4ea582ad4a
move phpcs:ignore 2018-09-02 11:12:07 +02:00
Philippe GRAND
3de16a145e Standardize and update code 2018-09-02 11:08:41 +02:00
Frédéric FRANCE
b60f7db60a
move phpcs:ignore 2018-09-02 10:43:34 +02:00
Frédéric FRANCE
47879d44bc
move phpcs:ignore 2018-09-02 09:57:19 +02:00
Frédéric FRANCE
e98b8e5e25
move phpcs:ignore 2018-09-02 09:27:59 +02:00
Frédéric FRANCE
71977514d7
Update actioncommreminder.class.php 2018-09-02 09:06:51 +02:00
Frédéric FRANCE
3e723af018
start changing phpcs:ignore 2018-09-01 23:46:13 +02:00
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
Frédéric FRANCE
10200374ef
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-09-01 14:06:23 +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
d8e6492e93 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2018-09-01 13:07:30 +02:00
Laurent Destailleur
5604f3b0c3
Merge pull request #9376 from frederic34/functionCommentMissing 
function Comment Missing
 2018-09-01 12:59:32 +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
Laurent Destailleur
482ddd548a
Merge pull request #9332 from frederic34/functionClosingBrace 
PSR2 FunctionClosingBrace
 2018-09-01 12:06:08 +02:00
Frédéric FRANCE
9454f897ef
doxygen fix 2018-09-01 09:40:50 +02:00
Philippe GRAND
9e880d3e72 Standardize and update code 2018-08-31 17:55:31 +02:00
Laurent Destailleur
7b1a705be4 Clean duplicate code 2018-08-31 13:50:58 +02:00
Philippe Grand
b3c84ac3bc
Merge branch 'develop' into new_branch_29_08_2018 2018-08-30 12:09:40 +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
5100b8b7b0
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-30 10:42:47 +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
Laurent Destailleur
489e766cbf Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/ticket/class/ticket.class.php
 2018-08-29 20:24:01 +02:00
Laurent Destailleur
3ebfb23407 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	.travis.yml
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/product/fournisseurs.php
	htdocs/ticket/class/ticket.class.php
 2018-08-29 20:22:50 +02:00
Laurent Destailleur
8b291b2053 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	README.md
 2018-08-29 19:55:10 +02:00
Laurent Destailleur
0c11007e34 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	README.md
	htdocs/comm/propal/card.php
 2018-08-29 18:53:39 +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
0e512cbc36
Merge remote-tracking branch 'upstream/develop' into trimtrailing2 2018-08-29 15:47:55 +02:00
Laurent Destailleur
ee204e2e64 Fix regression in php style 2018-08-29 15:37:35 +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
Laurent Destailleur
b648a28893 Fix regression 2018-08-29 11:57:43 +02:00
Frédéric FRANCE
846778657f
fix syntax error 2018-08-29 11:44:26 +02:00
Philippe GRAND
5b0425706c try to fix space errors 2018-08-29 11:39:38 +02:00
Philippe GRAND
84a9ca3f68 fix : Parse error: ./htdocs/comm/mailing/cibles.php:644 2018-08-29 10:40:30 +02:00
gauthier
61a57e619f FIX : $fk_account is always empty, must be $soc->fk_account 2018-08-28 16:54:04 +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
2349f99eb9 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-08-28 02:58:51 +02:00
Laurent Destailleur
50d50c2e10
Merge pull request #9307 from ATM-Marc/FIX_6.0_thirdparty_info 
NEW On customer/supplier card, add simple tooltip to amount boxes
 2018-08-28 02:48:05 +02:00
Laurent Destailleur
9c6ce4b29d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-08-28 02:36:15 +02:00
Laurent Destailleur
9a14611d55
Merge pull request #8996 from grandoc/new_branch_20_06_2018 
clean and update code
 2018-08-28 02:35:59 +02:00
Laurent Destailleur
2db84a679e Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/modulebuilder/index.php
 2018-08-28 02:35:45 +02:00
Laurent Destailleur
7219bac0b2
Merge pull request #9168 from frederic34/trimtrailing 
Trimtrailing
 2018-08-28 02:30:02 +02:00
Laurent Destailleur
32ef9695a7
Merge pull request #9282 from frederic34/patch-19 
Update card.php
 2018-08-28 02:28:35 +02:00
Laurent Destailleur
7462a1ae1d
Update card.php 2018-08-28 02:27:56 +02:00
Laurent Destailleur
2306f8a7c2
Merge pull request #9265 from grandoc/new_branch_18_08_2018 
Typo
 2018-08-28 02:25:24 +02:00
Laurent Destailleur
0a7ce338f9 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/class/commondocgenerator.class.php
 2018-08-28 02:23:34 +02:00
Laurent Destailleur
d90eed3098
Merge pull request #9291 from frederic34/patch-23 
typo
 2018-08-28 01:55:44 +02:00
Laurent Destailleur
534eadb7a2 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-08-28 01:35:43 +02:00
Marc de Lima Lucio
d09f9b2543 FIX: customer/supplier card: add simple tooltip to amount boxes 2018-08-27 18:19:42 +02:00
atm-ph
d9beb3f882 Fix tms missing in fetch propal 2018-08-27 10:19:07 +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
Frédéric FRANCE
85ae8f3901
Update card.php 2018-08-24 09:29:17 +02:00
Philippe GRAND
2fa82edd39 Standardize and update code 2018-08-23 17:07:27 +02:00
Frédéric FRANCE
343e6ce8b3
typo 2018-08-23 14:34:27 +02:00
Philippe Grand
f98d2078e2
Merge branch 'develop' into new_branch_20_06_2018 2018-08-23 10:41:34 +02:00
Philippe Grand
9b2e754b46
Update advtargetemailing.class.php 2018-08-22 22:41:22 +02:00
Philippe Grand
eeaa257f11
Update cactioncomm.class.php 2018-08-22 22:39:51 +02:00
Philippe Grand
c626dcb710
Update actioncomm.class.php 2018-08-22 22:38:00 +02:00
Philippe GRAND
449ef9c464 Update and standardize code 2018-08-22 18:12:44 +02:00
Frédéric FRANCE
0334409d18
Update card.php 2018-08-22 13:43:30 +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
Frédéric FRANCE
6b6daf178f
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-21 20:57:58 +02:00
Frédéric FRANCE
0fbccce9a7
Merge remote-tracking branch 'upstream/develop' into trimtrailing 2018-08-21 19:59:07 +02:00
Laurent Destailleur
db3c17668e Fix coding style 2018-08-21 19:08:11 +02:00
Frédéric FRANCE
aba69b94b2
Merge remote-tracking branch 'upstream/develop' into trimtrailing 2018-08-21 14:03:02 +02:00
Laurent Destailleur
0799970804
Merge pull request #9248 from frederic34/FunctionDeclaration 
function declaration
 2018-08-21 13:41:56 +02:00
Laurent Destailleur
85eed6cf80
Merge branch 'develop' into trimtrailing 2018-08-21 13:40:04 +02:00
Laurent Destailleur
289f194641
Merge pull request #9058 from defrance/patch-123 
New : Add total price on dashboard
 2018-08-21 13:33:33 +02:00
Laurent Destailleur
5e09d5160f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-08-21 13:17:20 +02:00
Laurent Destailleur
0f1e5a78c6 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-08-21 13:17:11 +02:00
Philippe Grand
ccdae4c597
Update html.formadvtargetemailing.class.php 2018-08-18 19:15:25 +02:00
Philippe GRAND
c8c8af55a0 Typo 2018-08-18 15:56:23 +02:00
Philippe GRAND
da951e61f2 Update and standardize code 2018-08-17 22:29:21 +02:00
Philippe GRAND
c48211ad70 Update and standardize code 2018-08-17 19:31:22 +02:00
Frédéric FRANCE
71d3af8b07
Update propal.class.php 2018-08-17 13:44:07 +02:00
Laurent Destailleur
4e02b134da Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2018-08-16 14:50:04 +02:00
Laurent Destailleur
2719c4eb43 Fix escape 2018-08-16 01:01:38 +02:00
Laurent Destailleur
4b7889b295 Fix left join broken 2018-08-16 01:00:38 +02:00
Frédéric FRANCE
54a078149a
function declaration 2018-08-15 17:34:35 +02:00
Laurent Destailleur
5a1a6ac095 Fix error message 2018-08-15 14:42:03 +02:00
Frédéric FRANCE
7bb781eea8
function declaration 2018-08-15 14:28:34 +02:00
Frédéric FRANCE
850ac34020
mark non camelCaps function 2018-08-13 17:26:32 +02:00
Frédéric FRANCE
82e8efe792
Merge remote-tracking branch 'upstream/develop' into trimtrailing 2018-08-12 20:14:14 +02:00
Laurent Destailleur
9fc5d39d07 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-08-12 20:09:36 +02:00
Laurent Destailleur
dc8c4402ee Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-08-12 20:09:22 +02:00
Laurent Destailleur
0a1c6e7194 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/compta/facture/list.php
	htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
 2018-08-12 20:08:20 +02:00
Frédéric FRANCE
6113b536a0
remove superfluous spaces 2018-08-12 19:59:39 +02:00
Laurent Destailleur
30b4d88428 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/product/reassort.php
	htdocs/societe/list.php
 2018-08-12 19:23:45 +02:00
Laurent Destailleur
61a5be6e2a Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-08-12 19:19:21 +02:00
Laurent Destailleur
b81b6b651f Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-08-12 19:17:26 +02:00
Frédéric FRANCE
6f74ecceaf
Merge remote-tracking branch 'upstream/develop' into trimtrailing 2018-08-12 18:21:59 +02:00
Laurent Destailleur
3d4d42462c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-08-12 16:30:21 +02:00
Laurent Destailleur
12e21b4886 FIX update extrafields 2018-08-12 16:29:26 +02:00
Laurent Destailleur
9b50bc2197 Fix css 2018-08-09 19:29:48 +02:00
Laurent Destailleur
61d7629ab1 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/list.php
 2018-08-08 17:44:22 +02:00
Juanjo Menent
ca7666793b
Merge pull request #9213 from fmarcet/develop 
New: Sales representative column on Propal List
 2018-08-08 11:11:20 +02:00
Frédéric FRANCE
9025c452ef
Merge remote-tracking branch 'upstream/develop' into trimtrailing 2018-08-07 16:40:03 +02:00
Philippe GRAND
68de0ba93b clean and update code 2018-08-07 10:56:59 +02:00
Ferran Marcet
c74ffade7d New: Sales representative column on Propal List 2018-08-07 10:05:50 +02:00
Philippe GRAND
948647f3f9 comment translation 2018-08-04 14:17:51 +02:00
Laurent Destailleur
b01f07efda
Merge branch 'develop' into FIX_project_overview 2018-08-02 18:43:55 +02:00