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

1282 Commits

Author SHA1 Message Date
ptibogxiv
0d69ae9e8c
NEW mode for list thirdparty API (add supplier) 
add new mode for more universel use of the api and easy switch between customer's and supplier's modes
 2019-10-15 09:52:14 +02:00
Frédéric FRANCE
d1d9b1ed85
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-15 09:39:57 +02:00
Frédéric FRANCE
352df8241e
Update api_thirdparties.class.php 2019-10-13 06:19:40 +02:00
Frédéric FRANCE
809d98129f
Update api_thirdparties.class.php 2019-10-13 06:14:45 +02:00
Frédéric FRANCE
9eaad23564
Update api_contacts.class.php 2019-10-13 06:12:53 +02:00
Frédéric FRANCE
367ef4acaf
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-11 16:44:25 +02:00
Laurent Destailleur
de107fb02e NEW Can set a squarred icon on your company setup 2019-10-11 11:27:05 +02:00
Frédéric FRANCE
98023353fe
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-03 17:21:31 +02:00
Laurent Destailleur
b60ee4c18c css 2019-10-03 09:58:49 +02:00
Frédéric FRANCE
aca9d92db8
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-01 22:03:33 +02:00
Frédéric FRANCE
010b2723b6
work on migration script 2019-10-01 20:14:06 +02:00
Laurent Destailleur
b79831ec39
Merge pull request #11952 from aspangaro/11.0_https 
Move Gnu.org to https
 2019-10-01 14:48:21 +02:00
Frédéric FRANCE
3b9bf2b06a
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-01 12:25:34 +02:00
Alexandre SPANGARO
16c6c9ae75 Merge remote-tracking branch 'upstream/develop' into 11.0_https 2019-10-01 06:12:24 +02:00
Alexandre SPANGARO
91b3bf76fd Merge branch 'develop' into 11.0_https 2019-10-01 06:11:43 +02:00
Frédéric FRANCE
b8dea76760
zapier api 2019-09-30 22:09:11 +02:00
Frédéric FRANCE
b87610adcc
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-09-30 19:34:35 +02:00
Frédéric FRANCE
258424416e
Merge remote-tracking branch 'upstream/develop' into zapier 2019-09-30 07:49:52 +02:00
Frédéric FRANCE
c7120e9e31
test 2019-09-29 20:36:18 +02:00
stickler-ci
21db14b22a Fixing style errors. 2019-09-29 18:21:26 +00:00
Frédéric FRANCE
0735bb5860
test 2019-09-29 20:21:05 +02:00
Frédéric FRANCE
1a12c93dc7
test 2019-09-29 20:06:30 +02:00
Frédéric FRANCE
1ef3a67644
test 2019-09-29 19:26:25 +02:00
Frédéric FRANCE
4bac865205
test 2019-09-29 18:40:36 +02:00
Frédéric FRANCE
cedad3dc26
fix? 
fix?

fix
 2019-09-29 18:23:31 +02:00
Frédéric FRANCE
05f3d86921
fix? 2019-09-29 11:48:53 +02:00
Frédéric FRANCE
6c8dc75c96
socialnetworks for thirdparties 2019-09-29 11:20:23 +02:00
Frédéric FRANCE
cea3669ffa
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-09-28 00:35:14 +02:00
Laurent Destailleur
6858dce344 Rename table for categorie of warehouses 2019-09-27 13:28:28 +02:00
Frédéric FRANCE
03086026b8
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-09-27 08:06:13 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Frédéric FRANCE
850b9fd52a
Merge remote-tracking branch 'upstream/develop' into zapier 2019-09-17 08:24:31 +02:00
Laurent Destailleur
23860b15ee Try a fix for #11852 2019-09-15 16:00:01 +02:00
Frédéric FRANCE
62922884fe
specimens 2019-09-12 18:12:28 +02:00
Frédéric FRANCE
9f3c54e5a5
definitions 2019-09-12 18:04:24 +02:00
Frédéric FRANCE
3fddef0c9e
add socialnetworks dictionary 2019-09-11 22:27:09 +02:00
Frédéric FRANCE
bd4c9a64a8
wip 2019-09-07 14:48:25 +02:00
Laurent Destailleur
529dd05226 Replace deprecated code 2019-09-06 10:53:05 +02:00
Laurent Destailleur
98459363df
Merge pull request #11795 from jtraulle/fix-doxygen-examples 
Fix Wrongly catched examples by Doxygen
 2019-09-03 12:45:23 +02:00
Laurent Destailleur
8cff008156 Fix error reporting 2019-09-02 16:03:20 +02:00
Laurent Destailleur
7f6ea3855c Fix error report of LDAP 2019-09-02 16:01:51 +02:00
Jean Traullé
c32c7d48ba
Fix Wrongly catched examples by Doxygen 2019-08-30 17:14:59 +02:00
Laurent Destailleur
05c9e97fe4 The deprecated method get_OutstandingBill has been removed. You can use 
getOutstandingBills() instead.
 2019-08-29 00:45:02 +02:00
Laurent Destailleur
290766acaa Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-26 23:57:15 +02:00
Laurent Destailleur
513f224349 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-08-26 23:56:43 +02:00
Laurent Destailleur
c7f06fe50e Fix phpcs 2019-08-26 23:56:17 +02:00
Laurent Destailleur
999db7ed41 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/salaries/card.php
	htdocs/compta/sociales/class/chargesociales.class.php
	htdocs/takepos/invoice.php
 2019-08-26 16:49:25 +02:00
Laurent Destailleur
c93e6550ce Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/compta/paiement.php
	htdocs/compta/sociales/class/chargesociales.class.php
 2019-08-26 16:43:24 +02:00
Laurent Destailleur
dcfbba9af5 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/compta/sociales/class/chargesociales.class.php
 2019-08-26 16:41:06 +02:00
Laurent Destailleur
d245ca371e
Update societe.class.php 2019-08-09 23:45:06 +02:00
Frédéric FRANCE
372eddf0c6
Update societe.class.php 2019-08-07 13:49:14 +02:00
Maxime Kohlhaas
be6ad7b6a4 New : can define RUM date on third bank account 2019-07-28 17:10:37 +02:00
Laurent Destailleur
6fa4a99a1b
Merge pull request #11533 from OPEN-DSI/new-api-contacts-deletecategories 
FIX Delete a category to a contact in API
 2019-07-22 18:30:34 +02:00
Laurent Destailleur
f368ef377b Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/societe/class/societe.class.php
 2019-07-20 16:02:15 +02:00
Laurent Destailleur
73b5302905 Fix var not defined 2019-07-20 16:00:16 +02:00
Laurent Destailleur
6594b361b1 Removed useless code 2019-07-20 15:56:20 +02:00
Laurent Destailleur
fea12c3c59 Fix class not found error 2019-07-20 15:55:22 +02:00
Laurent Destailleur
2e68488231 Enhance scan using phpstan 2019-07-20 15:53:46 +02:00
Laurent Destailleur
a900055631 Fix class not found error 2019-07-20 15:53:21 +02:00
VESSILLER
b95395909c FIX Delete a category to a contact in API 2019-07-19 16:11:44 +02:00
Laurent Destailleur
adfbd62f8b Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-14 00:44:35 +02:00
Laurent Destailleur
2a05164bb1 FIX Better PHP compatibility 2019-07-14 00:31:28 +02:00
VESSILLER
266ed86194 NEW Add a category to a contact in API 2019-07-08 12:37:24 +02:00
Laurent Destailleur
fa476b4994 Properties ->libelle_incoterms were renamed into ->label_incoterms 2019-06-25 13:00:02 +02:00
Laurent Destailleur
1daac232b0 Code comment 2019-06-24 14:31:58 +02:00
Laurent Destailleur
e12fde398a Fix phpcs 2019-06-23 19:50:55 +02:00
Laurent Destailleur
efa09301b1 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-22 20:19:14 +02:00
Laurent Destailleur
b202c7eaa0 Fix confusion between ->childs and ->childsoncascade 2019-06-22 20:17:40 +02:00
Laurent Destailleur
eb20df8e64 Fix debug save of state into setup 2019-06-22 14:47:46 +02:00
Laurent Destailleur
4721dc3d34 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-22 11:57:39 +02:00
Laurent Destailleur
9644b9c669
Merge pull request #10932 from tony13tv/patch-6 
[CHANGE] Make State available in .odt templates...
 2019-06-22 11:26:32 +02:00
Laurent Destailleur
0bc0f8ae94 Fix translation of country 2019-06-21 15:40:35 +02:00
Laurent Destailleur
e60020140d
Update societe.class.php 2019-06-20 04:11:10 +02:00
Laurent Destailleur
898d766489
Merge pull request #11354 from rycks/allowZeroAsAccountNumber 
Allow zero as account number
 2019-06-20 03:09:37 +02:00
Eric Seigne
80d4d8754d allow zero as accountancy code nomber (replace all empty tests by != '') 2019-06-17 18:28:11 +02:00
Laurent Destailleur
bde49e05e7 Fix doc 2019-06-17 18:23:38 +02:00
Laurent Destailleur
48b2cb83af Close #11152 by a manual merge to keep only required things 2019-06-16 17:08:23 +02:00
Laurent Destailleur
2218994958 FIX Duplicate encoding on error message 2019-05-29 09:51:45 +02:00
Laurent Destailleur
4a69541419 Several bug fixes using phpstan 2019-05-15 18:59:46 +02:00
ptibogxiv
23f4536a78
FIX : sync data thirdparty to member 2019-04-25 19:22:14 +02:00
Laurent Destailleur
d64e6a6a1b
Merge branch 'develop' into patch-6 2019-04-25 02:54:03 +02:00
Laurent Destailleur
99639ef429 FIX #11013 2019-04-24 11:25:14 +02:00
Laurent Destailleur
f5fb8363d8 FIX #11041 2019-04-24 10:26:57 +02:00
atm-quentin
6deba39c6a FIX credit note can be split 2019-04-12 10:16:13 +02:00
Laurent Destailleur
2b87c8b663
Merge pull request #10810 from mwelters/patch-1 
NEW improve Expensereport, Inverse Receiver
 2019-04-08 14:04:08 +02:00
Laurent Destailleur
54714bc755 Deprecated property ->fk_departement is now ->state_id everywhere. 2019-04-05 20:06:13 +02:00
Laurent Destailleur
fff9b7db9d Fix doxygen 2019-04-04 18:33:12 +02:00
Cristian Torres
64e91fa25b [CHANGE] Making State available in .odt templates... 
...making use of the same strategy when loading Country info from single attribute.
Previously attempted on PR #10463 which has been closed

This also relates to #7428
 2019-03-27 17:09:59 -06:00
Josep Lluís
3d1ebb8379
FIX filter by name_alias field on fetch 
In fetch, when filtering by name_alias field, is used a wrong name of field (nom_alias)
 2019-03-27 13:41:29 +01:00
markus
f942917f53 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into patch-1 2019-03-24 17:42:49 +01:00
Philippe GRAND
2ad649eaea add some comments 2019-03-21 15:18:05 +01:00
Philippe GRAND
e8721fdd07 add some comments 2019-03-21 15:14:09 +01:00
Laurent Destailleur
40c2ca4310 Fix label of status of third party record when using smartphone 2019-03-15 23:08:00 +01:00
Laurent Destailleur
5027a36dfb Fix missing transaction on add_commercial method. 2019-03-15 19:34:04 +01:00
Christophe Battarel
ae50a8b896 change add_commercial signature 2019-03-12 10:48:08 +01:00
markus
1e4ed531b4 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2019-03-08 11:47:08 +01:00
Frédéric FRANCE
f283782445
change visibility 2019-03-04 19:57:46 +01:00
markus
c905575d3e Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2019-03-04 17:26:40 +01:00
Frédéric FRANCE
62501b11e8
add visibility 2019-03-02 00:14:22 +01:00
Laurent Destailleur
3bffa69f1d Remove deprecated code 2019-02-27 15:23:56 +01:00
Laurent Destailleur
6373e1db84
Merge branch 'develop' into 10.0_linkedin 2019-02-27 01:16:21 +01:00
Laurent Destailleur
3a2a1b4a56 Debug module ticket 2019-02-26 13:43:09 +01:00
markus
d38bff6f14 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2019-02-26 12:31:24 +01:00
atm-quentin
dc7a2fbb30 FIX placement function 2019-02-25 10:01:26 +01:00
Alexandre SPANGARO
2da1447a0b Merge remote-tracking branch 'upstream/develop' into 10.0_linkedin 2019-02-25 09:12:04 +01:00
Alexandre SPANGARO
acb9cfe07a NEW: Add LinkedIn field 2019-02-25 09:07:58 +01:00
Laurent Destailleur
6b46a927f1
Merge branch 'develop' into PSR2MethodsFunctionCallSignatureSpaceBeforeOpenBracket 2019-02-24 20:53:54 +01:00
Frédéric FRANCE
894123fb06
PSR2.Methods.FunctionCallSignature.SpaceBeforeOpenBracket 2019-02-24 20:06:55 +01:00
Frédéric FRANCE
a497a81aac
Update api_contacts.class.php 2019-02-23 19:09:27 +01:00
atm-quentin
7850925441 FIX amount opened on thirdparty card dont care of credit note not converted 2019-02-22 15:10:41 +01:00
markus
aa5dfb3cf9 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2019-02-16 14:43:35 +01:00
Laurent Destailleur
43ef2d1be6
Update api_contacts.class.php 2019-02-15 15:10:10 +01:00
ptibogxiv
df9f248537
Update api_contacts.class.php 2019-02-14 21:12:00 +01:00
ptibogxiv
bc8b6ed993
Fix count ref in contact list API 2019-02-14 17:23:48 +01:00
Laurent Destailleur
a7af1b1765 Remove deprecated code 2019-02-14 16:29:13 +01:00
Laurent Destailleur
aedf91b522 Fix: add parameter $includecount 2019-02-14 16:22:42 +01:00
ptibogxiv
0aeaac7c5f
Fix count of ref in an contact object API 2019-02-14 16:00:45 +01:00
markus
01b12793d2 fix typo in comment 2019-02-12 13:59:55 +01:00
Frédéric FRANCE
1e43f8e54a
PEAR FunctionCallSignature 2019-02-10 10:45:49 +01:00
Laurent Destailleur
af92303319
Merge pull request #10487 from frederic34/psr2squizwhite 
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent
 2019-02-08 09:30:25 +01:00
Laurent Destailleur
9e28db4202 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/tools/export.php
 2019-02-06 00:51:10 +01:00
Laurent Destailleur
ce5717a7b7 FIX Default language of company is not set 2019-02-05 20:43:26 +01:00
Frédéric FRANCE
970392adb8
Merge remote-tracking branch 'upstream/develop' into psr2squizwhite 2019-02-03 22:41:57 +01:00
markus
bc2c6282d9 Merge branch 'develop' of https://github.com/mwelters/dolibarr into develop 2019-02-03 17:48:04 +01:00
Frédéric FRANCE
80a12fcd1c
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent 2019-02-03 14:29:45 +01:00
Laurent Destailleur
e18bd6f986
Merge branch 'develop' into nospaceaftercomma 2019-01-30 18:27:35 +01:00
Laurent Destailleur
408609e0ec Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/tpl/objectline_edit.tpl.php
 2019-01-30 16:54:38 +01:00
Laurent Destailleur
9fdba921b4 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/lib/functions.lib.php
 2019-01-30 16:48:33 +01:00
Laurent Destailleur
81ae4c52c5
Merge pull request #10446 from mapiolca/8.0 
Fix #10317 et #10318
 2019-01-30 16:43:14 +01:00
Laurent Destailleur
e72d6c50e6
Merge pull request #10428 from frederic34/toomanylines 
PSR2.Files.EndFileNewline.TooMany
 2019-01-30 16:17:09 +01:00
Laurent Destailleur
648eea3a70
Merge branch 'develop' into nospaceaftercomma 2019-01-30 16:00:11 +01:00
Laurent Destailleur
869159c09f Fix regression in look and feel (if empty, we do not sho value) 2019-01-30 15:31:39 +01:00
Laurent Destailleur
1a292839ca Fix regression in look and feel (if empty, we do not sho value) 2019-01-30 15:31:18 +01:00
Laurent Destailleur
17c3337c9b Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-01-30 15:25:43 +01:00
Regis Houssin
9539bea68a FIX bad sql request 2019-01-29 12:17:51 +01:00
Regis Houssin
39b696af02 FIX multicompany compatibility 2019-01-29 12:01:40 +01:00
Pierre Ardoin
eca1a2cd64
Update societe.class.php 2019-01-29 11:08:13 +01:00
Alexandre SPANGARO
cc88c4f8ff Move my email to the new one 2019-01-28 21:39:22 +01:00
Frédéric FRANCE
b10558bacd
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-27 23:23:38 +01:00
Laurent Destailleur
f30a3d59ba
Merge branch 'develop' into toomanylines 2019-01-27 17:59:13 +01:00
Laurent Destailleur
4f9f0fd7b5
Merge branch 'develop' into elseif 2019-01-27 17:54:06 +01:00
Frédéric FRANCE
f0cdf300d1
Squiz.Functions.FunctionDeclarationArgumentSpacing 2019-01-27 15:20:16 +01:00
Frédéric FRANCE
496fa9b0fb
PSR2.Files.EndFileNewline.TooMany 2019-01-27 14:10:35 +01:00
Frédéric FRANCE
7ee086b402
PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
Frédéric FRANCE
6e91b3cefc
PSR2 usage of else if is discouraged 2019-01-27 10:49:34 +01:00
markus
00597477e4 Fix #10263 2019-01-26 16:06:40 +01:00
Laurent Destailleur
300889f53a # WARNING: head commit changed in the meantime 
Fix
 2019-01-19 13:22:38 +01:00
Laurent Destailleur
2bbaae88d6 Fix standardize 'createfromclone' param when cloning 2019-01-19 12:46:38 +01:00
mapiolca
aa10d345bd
Update societe.class.php 
Ajoute la sélection de l'entité avec Multicompagny pour les encours clients.
 2019-01-04 17:57:16 +01:00
ldestailleur
bc00fb177a Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-02 19:42:15 +01:00
ldestailleur
a9e8e13bb6 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	ChangeLog
	htdocs/user/param_ihm.php
 2019-01-02 19:41:39 +01:00
Frédéric FRANCE
cad95c7dc2
Update societe.class.php 2019-01-02 15:39:22 +01:00
Laurent Destailleur
44a6644969 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-12-18 21:55:53 +01:00
Laurent Destailleur
89068ffef1 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/adherents/subscription.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
	htdocs/langs/es_ES/companies.lang
	htdocs/langs/es_ES/errors.lang
	htdocs/product/stock/product.php
	htdocs/user/card.php
 2018-12-18 21:55:14 +01:00
Laurent Destailleur
31d032d5d3 FIX Can't create a thirdparty from member if customer code is mandatory. 2018-12-18 21:00:06 +01:00
Laurent Destailleur
88a52aa11d
Merge branch 'develop' into develop_mc 2018-12-14 15:58:52 +01:00
Regis Houssin
8953a3ed73 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_mc

Conflicts:
	ChangeLog
 2018-12-03 08:46:03 +01:00
Maxime Kohlhaas
2e496ea83a QUAL rename facnumber by ref 2018-12-02 17:33:44 +01:00
Laurent Destailleur
6d84036f66 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/index.php
	htdocs/contact/list.php
	htdocs/core/class/html.form.class.php
	htdocs/expensereport/card.php
	htdocs/install/doctemplates/shipment/template_shipment.odt
	htdocs/public/payment/newpayment.php
 2018-12-01 19:23:06 +01:00
Juanjo Menent
1c04c2b5f4 Fix #10097 2018-12-01 10:38:40 +01:00
Regis Houssin
aaa9a4f47c FIX use getEntity('invoice') instead getEntity('facture') 2018-11-15 17:27:49 +01:00
Regis Houssin
89389baeac Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email 2018-11-09 15:37:29 +01:00
Laurent Destailleur
3e844db74f Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fichinter/stats/index.php
 2018-11-08 20:19:28 +01:00
Laurent Destailleur
27dcf18637 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-11-08 18:43:31 +01:00
Laurent Destailleur
e92a63ba73 FIX If we change customer/supplier rule we can't edit old thirdparty. 2018-11-08 17:15:35 +01:00
Laurent Destailleur
0c7f33e1ba Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-11-05 09:58:19 +01:00
Laurent Destailleur
2900947019 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-11-05 09:56:57 +01:00
Maxime Kohlhaas
29c0448a2e Fix parent link was not removed on societe deletion #9106 2018-11-01 15:41:58 +01:00
Philippe GRAND
b7f5e9e6c7 complete comment 2018-11-01 11:50:55 +01:00
Regis Houssin
569d59d251 FIX change my deprecated email 2018-10-27 14:43:12 +02:00
Laurent Destailleur
0e464ea4f5
Merge pull request #9866 from frederic34/emptylines 
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose
 2018-10-26 15:31:24 +02:00
Laurent Destailleur
094bcc519f Fix show customer code only if customer in company tooltip 2018-10-25 17:25:36 +02:00
Frédéric FRANCE
86d854f3f4
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose 2018-10-24 23:04:26 +02:00
Laurent Destailleur
d0ab12ba6e Fix not used var 2018-10-24 11:10:55 +02:00
Laurent Destailleur
cd9431809b Fix: do not loose country_code after update 2018-10-21 11:44:21 +02:00
Laurent Destailleur
6a6a8ae14b Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-19 14:29:22 +02:00
Laurent Destailleur
5a1a5548df Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/core/class/discount.class.php
	htdocs/core/lib/payments.lib.php
	htdocs/product/index.php
	htdocs/product/list.php
	htdocs/societe/class/societe.class.php
 2018-10-19 14:27:15 +02:00
Laurent Destailleur
b6e333876e FIX #9813 2018-10-19 12:56:21 +02:00
gauthier
aea7299970 FIX : use discount with multicurrency 2018-10-17 15:49:08 +02:00
Laurent Destailleur
2ce1aaaebf
Update api_thirdparties.class.php 2018-10-16 21:43:40 +02:00
ptibogxiv
5e20390e15
FIX call of bankaccount class 2018-10-16 21:33:42 +02:00
Laurent Destailleur
97429aeb7a
Merge pull request #9721 from grandoc/new_branch_10_10_2018 
Standardize and update code
 2018-10-16 19:30:19 +02:00
Laurent Destailleur
2c1e8d6535 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/expedition/class/expeditionbatch.class.php
	htdocs/public/payment/newpayment.php
	htdocs/stripe/config.php
 2018-10-16 18:47:11 +02:00
Laurent Destailleur
532e05c42e Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	ChangeLog
	htdocs/filefunc.inc.php
 2018-10-13 14:29:51 +02:00
Laurent Destailleur
9f27dd41e5 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	ChangeLog
	htdocs/filefunc.inc.php
	htdocs/societe/class/societe.class.php
 2018-10-12 19:08:06 +02:00
Philippe GRAND
7e6cdfb5ec Standardize and update code 2018-10-12 09:34:54 +02:00
Frédéric FRANCE
c3f07dd2e0
define $code for all execution paths 2018-10-09 19:28:52 +02:00
Laurent Destailleur
0938ac4afa Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/user/list.php
 2018-10-09 14:54:18 +02:00
Laurent Destailleur
3c8b365c3e Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-09 14:53:39 +02:00
Philippe GRAND
ac214a7258 Standardize code 2018-10-09 08:53:08 +02:00
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
923b561aff FIX Option for prof id mandatory not working with custom type of company 2018-10-08 20:01:45 +02:00
Laurent Destailleur
44d0ed7a0c Introduce SOCIETE_SHOW_FIELD_IN_TOOLTIP for fields to show in tooltip 2018-10-08 15:13:01 +02:00
Philippe GRAND
956c7b21e2 Standardize code 2018-10-06 12:18:03 +02:00
Philippe GRAND
b3925dd2bd Standardize code 2018-10-05 16:04:10 +02:00
Philippe GRAND
bcfdeeea88 Standardize code 2018-10-05 15:55:47 +02:00
Philippe GRAND
073ec85208 Standardize code 2018-10-05 15:51:08 +02:00
Laurent Destailleur
84c062a03d
Merge pull request #9637 from frederic34/patch-10 
add code_compta_client to Societe class
 2018-10-01 01:16:18 +02:00
Frédéric FRANCE
a88262e9a6
add code_compta_client to Societe class 2018-09-30 10:52:40 +02:00
Philippe GRAND
b183054073 Standardize and update code 2018-09-28 15:57:13 +02:00