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
Alexandre SPANGARO
2c74caff90
WIP
2019-07-22 06:56:55 +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
Laurent Destailleur
b2576305c1
Clean code
2018-09-28 10:46:59 +02:00
Laurent Destailleur
98b1e13ed7
Work on module socialnetworks
2018-09-26 16:55:46 +02:00
Laurent Destailleur
79ade6a1af
Work on website
2018-09-26 15:20:37 +02:00
Philippe GRAND
9c9f5bd3c3
Standardize and update code
2018-09-20 17:26:39 +02:00
Laurent Destailleur
6ea7a6bce7
Try some fix to generate mandate
2018-09-20 17:09:31 +02:00
Frédéric FRANCE
237f888356
Update api_thirdparties.class.php
2018-09-19 18:47:59 +02:00
Frédéric FRANCE
9ee88e9d35
remove superfluous spaces
2018-09-19 18:33:11 +02:00
Laurent Destailleur
cde023148a
Merge pull request #9121 from yolocodefrench/develop
...
Generation of the mandate file from the api
2018-09-19 14:47:25 +02:00
Laurent Destailleur
f240cd130d
Update api_thirdparties.class.php
2018-09-19 14:47:11 +02:00
Laurent Destailleur
019ba74225
Update api_thirdparties.class.php
2018-09-19 14:44:16 +02:00
Frédéric FRANCE
cb2d72d5c1
reduce complexity libstatut societe class
2018-09-16 09:22:49 +02:00
Frédéric FRANCE
e89ef9c3db
reduce complexity libstatut societe.account.class
2018-09-16 07:58:16 +02:00
Frédéric FRANCE
2b62c4ca8f
Merge remote-tracking branch 'upstream/develop' into camelCaps2
2018-09-08 10:50:27 +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
42565e722e
Standardize and update code
2018-09-04 13:37:00 +02:00
Frédéric FRANCE
b60f7db60a
move phpcs:ignore
2018-09-02 10:43:34 +02:00
Frédéric FRANCE
e98b8e5e25
move phpcs:ignore
2018-09-02 09:27:59 +02:00
Philippe GRAND
db32d8903e
Standardize and Update code
2018-09-01 23:20:20 +02:00
Philippe GRAND
7b0d3c32ab
Standardize and Update code
2018-09-01 22:55:10 +02:00
Philippe GRAND
5d273960dc
fix conflict
2018-09-01 22:40:38 +02:00
Philippe GRAND
45cbc36a15
Standardize and update code
2018-09-01 15:27:55 +02:00
Laurent Destailleur
26cff9e11f
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/langs/en_US/blockedlog.lang
htdocs/stripe/config.php
2018-09-01 14:13:01 +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
1944ef0dc3
conflict resolution
2018-09-01 12:38:22 +02:00
Laurent Destailleur
482ddd548a
Merge pull request #9332 from frederic34/functionClosingBrace
...
PSR2 FunctionClosingBrace
2018-09-01 12:06:08 +02:00
Philippe GRAND
bb05e80a87
Standardize and update code
2018-08-31 18:47:25 +02:00
Philippe GRAND
70ae8c6081
Standardize and update code
2018-08-31 18:27:16 +02:00
Laurent Destailleur
e7d4956f5b
Clean not used function
2018-08-31 11:29:30 +02:00
Laurent Destailleur
07d5bd143a
Fix entity
2018-08-31 11:26:53 +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
fe4260a014
Merge remote-tracking branch 'upstream/develop' into camelCaps
2018-08-28 09:34:53 +02:00
Laurent Destailleur
b1fc45fe3d
Merge branch 'develop' into develop
2018-08-28 02:43:04 +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
Laurent Destailleur
998dca9b9f
Update api_thirdparties.class.php
2018-08-28 02:05:37 +02:00
Jean Traullé
e0c2dd0c3c
Fix of an oversight when swapping parameters
2018-08-26 21:57:07 +02:00
Jean Traullé
d348ac83bb
Fix Travis CI Code reported coding style issues
2018-08-26 20:16:21 +02:00
Jean Traullé
e035a688f0
Keep params order in sync between @parm, @url annotations and function signature.
2018-08-26 19:41:32 +02:00
Jean Traullé
cc7ca8c7fa
Opening brakets should be on new lines
2018-08-26 18:15:14 +02:00
Jean Traullé
d8e15e529c
New REST API improvements to thirdparties bank accounts and gateways
...
- API endpoints has been added and documented to allow user to add, update and delete payment gateways like the one used by Stripe module (stored in table llx_societe_account)
- API endpoints for CompanyBankAccounts has been slightly modified to be harmonized with other API endpoints (this should not be a problem since these methods are not yet in Dolibarr latest stable version (aka 8.0))
- Some documentation has been improved (to be shown in REST explorer)
- societeaccount.class.php has been slightly modified to include missing $login member ; notnull value of member fk_website is now -1 to put it to NULL when updating the record.
2018-08-26 17:29:04 +02:00
Philippe GRAND
30992f2730
Standardize and update code
2018-08-23 18:52:47 +02:00
Philippe GRAND
0c75c41e7b
Update and standardize code
2018-08-22 19:56:24 +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
54a078149a
function declaration
2018-08-15 17:34:35 +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
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
12e21b4886
FIX update extrafields
2018-08-12 16:29:26 +02:00
STAGIAIRE-PC\Pierre
61995a3e02
Ajout d'une colonne indispensable dans la requete json
2018-07-30 17:34:43 +02:00
STAGIAIRE-PC\Pierre
ff8d31925b
ajout du parametre companyBankid
2018-07-30 09:37:41 +02:00
STAGIAIRE-PC\Pierre
df6ad44261
correction de l'année
2018-07-19 15:15:54 +02:00
STAGIAIRE-PC\Pierre
d8b212897b
ajout de credits
2018-07-19 15:13:55 +02:00
STAGIAIRE-PC\Pierre
294f14ab63
Generation of the mandate file from the api
2018-07-19 15:09:32 +02:00
Laurent Destailleur
5f52dfa873
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-10 14:02:40 +02:00
Regis Houssin
3e5271967b
FIX missing entity field
2018-07-08 12:11:22 +02:00
Laurent Destailleur
3a593f88f1
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/install/upgrade2.php
2018-07-05 10:28:24 +02:00
Laurent Destailleur
5883899bc7
Little debug of option WEBSITE_USE_WEBSITE_ACCOUNTS
2018-07-05 02:33:39 +02:00
Laurent Destailleur
8d3fff5568
Merge pull request #8738 from atm-quentin/NEW_triggers_commercial_add
...
NEW triggers add commercial and del commercial
2018-06-30 01:44:10 +02:00
Laurent Destailleur
0f62408700
Remove duplicated code
2018-06-30 01:34:51 +02:00
Laurent Destailleur
1ff8788ff7
Merge pull request #9016 from yolocodefrench/develop
...
ajout de la gestion des comptes bancaires des tiers via l'api
2018-06-30 01:26:08 +02:00
STAGIAIRE-PC\Pierre
8a780b3910
Code refactorisation
2018-06-27 11:01:20 +02:00
STAGIAIRE-PC\Pierre
62f2108101
ajout de la gestion des comptes bancaires des tiers via l'api
2018-06-27 10:33:57 +02:00
Laurent Destailleur
5829014218
Merge branch 'develop' into NEW_advance_targer_filter_everywhere
2018-06-24 10:24:26 +02:00
Laurent Destailleur
2d89d9634b
Fix search on extrafields
2018-06-20 23:16:06 +02:00
Laurent Destailleur
a73296e212
Fix reseller not saved
2018-06-19 19:34:23 +02:00
atm-ph
cb3704b67e
Fix can't add an attribute simply
2018-06-15 11:02:46 +02:00
Loïc Barouty
945b71d6af
FIX: Link does not work when there is spaces in SIREN (like in the main format)
2018-06-08 23:38:44 +02:00
Laurent Destailleur
29ee5dffc4
Clean code
2018-06-04 12:55:55 +02:00
areaeuro
11714b9b6b
Update societe.class.php
...
Line 2942 throws an error in php 7 "Warning: A non-numeric value encountered" when doing math sum, as substr() may be empty.
Convert to intval(substr()) to fix.
2018-05-18 10:27:54 +02:00
atm-quentin
5802eb63ec
FIX name of trigger and use of context
2018-05-07 11:36:34 +02:00
atm-quentin
04228cca82
NEW triggers add commercial and del commercial
2018-05-04 12:20:29 +02:00
Laurent Destailleur
411949a6bb
Optimize constructors
2018-04-21 15:08:46 +02:00
Laurent Destailleur
0d0da234b1
Lowercase NULL, TRUE, FALSE according to PSR2
2018-04-16 13:51:16 +02:00
atm-quentin
ba5ac47602
NEW OnSearchAndListGoOnCustomerOrSupplierCard conf
2018-04-13 15:48:58 +02:00
Laurent Destailleur
1feee6378f
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-04-11 14:45:52 +02:00
Laurent Destailleur
f181719769
Can fetch a companypaymentmode of a thirdparty
2018-04-10 18:11:08 +02:00
atm-quentin
6277928b67
FIX issue #8470
2018-04-10 14:01:35 +02:00
Laurent Destailleur
7108f68db9
Remove old deprecated hook insertExtraFields. Triggers must be used for
...
action on CRUD events.
2018-04-10 12:03:01 +02:00
Laurent Destailleur
65996c47ff
Fix clean email syntax to remove , to avoid error RFC-5321 address
2018-04-10 11:15:21 +02:00
Laurent Destailleur
24f4d5040a
Move isInEEC from common to thirdparty class.
2018-04-09 14:25:02 +02:00
Laurent Destailleur
6c409b2670
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-04-05 18:08:19 +02:00
Laurent Destailleur
8cf56a5b9c
Fix regression
2018-04-05 16:29:37 +02:00
Laurent Destailleur
5b50b8bd40
Merge pull request #8491 from hregis/develop_multicompany
...
Fix: possibility to change entity for new thirdparty
2018-04-05 16:11:53 +02:00
Laurent Destailleur
eeb2d5a4da
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/commonobject.class.php
htdocs/core/class/extrafields.class.php
htdocs/cron/list.php
2018-04-05 13:24:36 +02:00
Laurent Destailleur
08ab67289b
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/societe/class/societe.class.php
2018-04-05 13:10:11 +02:00
Regis Houssin
e09c85cfdb
Fix: possibility to change entity for new thirdparty
2018-04-01 13:45:39 +02:00
Laurent Destailleur
96c73a13f6
Clean code
2018-03-31 16:45:36 +02:00
Laurent Destailleur
0e986b8f97
Update societe.class.php
2018-03-29 13:48:09 +02:00
atm-ph
a89983ef5c
Fix error on creating company with external module in 'custom' folder with a file to generate accountancy code
2018-03-28 15:41:10 +02:00
Laurent Destailleur
6ef1dbbe0f
FIX auto open contract if one result found
2018-03-24 18:28:06 +01:00
Laurent Destailleur
d6f3fc9fe7
Fix use the getSalesRepresentative function instead of get_users
2018-03-22 16:05:50 +01:00
Laurent Destailleur
86e496963b
Merge pull request #8081 from atm-maxime/new_salesrep
...
NEW improve way of adding users/sales representative to thirdparty
2018-03-22 14:05:44 +01:00
Laurent Destailleur
71c51eb789
NEW Add hook printEmail
2018-03-15 22:22:42 +01:00
Laurent Destailleur
c962b89495
NEW hook getnomurltooltip is replaced with hook getNomUrl more powerfull
2018-03-15 20:46:55 +01:00
Maxime Kohlhaas
3de6e1a6cb
Simplify SIREN check function
2018-03-15 12:02:49 +01:00
Maxime Kohlhaas
8ae90bebaf
New rule for FR siret value check
2018-03-15 09:50:33 +01:00
Laurent Destailleur
f0f6f71161
Fix Sqli
2018-03-15 01:55:47 +01:00
Laurent Destailleur
4957ea9178
Fix SQLi reported by op7ica
2018-03-15 01:55:16 +01:00
Laurent Destailleur
c3b9c91200
Fix SQLi reported by op7ica
2018-03-15 01:33:46 +01:00
Laurent Destailleur
b232681318
NEW Add a button to create Stripe customer from the Payment mode tab
2018-03-14 16:53:16 +01:00
Laurent Destailleur
3f7cd8b1bd
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-03-14 13:56:41 +01:00
Laurent Destailleur
5c2a005e75
Work on generic customer payment modes
2018-03-14 13:56:21 +01:00
Laurent Destailleur
268b07bcf0
Can add/delete credit card localy
2018-03-14 11:51:13 +01:00
Laurent Destailleur
cc9a6ee6e0
Merge pull request #7428 from ruistrecht-alt/NEW_Show_Region_in_company_info_&_Global_option_to_show_state_code_MAIN_SHOW_STATE_CODE
...
NEW Show region in company info & Global option to show state code MAIN_SHOW_STATE_CODE
2018-03-14 10:49:54 +01:00
Laurent Destailleur
da617f7d32
Can work both with remote and local payment modes
2018-03-13 22:43:50 +01:00
Laurent Destailleur
c78e5d23ea
Work on the customer payment mode tab
2018-03-13 20:23:59 +01:00
Laurent Destailleur
2566170c68
Use code of societeaccount
2018-03-13 17:47:43 +01:00
Laurent Destailleur
944ba69cd8
Add unique key. Dolibarrize view of stripe card.
2018-03-13 17:32:49 +01:00
Maxime Kohlhaas
ded69bf57d
New : link users to company like a tag
2018-03-09 18:59:06 +01:00
Laurent Destailleur
9f42e1b172
Prepare code to introduce different payment modes than BAN
2018-03-08 22:33:40 +01:00
Laurent Destailleur
489dde4db4
Prepare database to store payment modes of customers
2018-03-08 22:26:42 +01:00
Laurent Destailleur
1c9e7145e7
Merge pull request #8276 from ATM-Consulting/develop_atm
...
NEW: supplier credit notes & discounts (absolute and relative)
2018-03-08 20:06:37 +01:00
Laurent Destailleur
2f9f4d0675
WIP Create payment of member subscription with paypal
2018-03-05 21:46:24 +01:00
Marc de Lima Lucio
1765b09fda
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm
2018-03-05 11:05:38 +01:00
Laurent Destailleur
6338328c90
Fix scrutinizer errors
2018-03-04 11:09:53 +01:00
Rui Strecht
97f7de9d3a
Fixed GB check url
2018-02-28 14:36:49 +00:00
Rui Strecht
9eb9228268
Added idprof url for country PT
2018-02-28 12:51:29 +00:00
Rui Strecht
5ef00d200f
Added idprof1 check to country PT
2018-02-28 12:26:05 +00:00
Marc de Lima Lucio
7cd1b2caa9
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm
2018-02-27 16:45:01 +01:00
Marc de Lima Lucio
9cf45266f5
NEW: supplier relative discounts
2018-02-27 16:30:39 +01:00
Laurent Destailleur
d8bf553ea9
Add option THIRDPARTY_LOGO_ALLOW_EXTERNAL_DOWNLOAD for logo indexing
2018-02-23 19:55:15 +01:00
Laurent Destailleur
829de06bf6
Fix error management
2018-02-23 11:23:04 +01:00
Laurent Destailleur
c4130730cb
Clean code around fetch_optionals()
2018-02-20 19:38:18 +01:00
Laurent Destailleur
276f2dce77
FIX #8200
2018-02-20 14:55:23 +01:00
Marc de Lima Lucio
95be155010
FIX: supplier credit notes: harmonize discount filters
2018-02-20 12:26:29 +01:00
Marc de Lima Lucio
e2b65b3755
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_supplier_credit_note
2018-02-16 09:14:53 +01:00
Laurent Destailleur
6b74c79798
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/website.lang
2018-02-15 15:34:17 +01:00
Laurent Destailleur
f0855da0fb
Fix responsive
2018-02-15 12:57:04 +01:00
Marc de Lima Lucio
daca27b2ed
NEW: supplier credit notes: split display in thirdparty discount page + fixes + refactoring
2018-02-14 18:02:40 +01:00
Marc de Lima Lucio
4f9bb33600
NEW: supplier credit notes: convert to usable absolute discount + link/unlink to supplier invoice + create supplier credit note from excess paid
2018-02-14 10:47:10 +01:00
Laurent Destailleur
6bdb82cf27
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/societe/class/api_thirdparties.class.php
2018-02-12 04:15:47 +01:00
Laurent Destailleur
55779e3b55
Fix confusion between supplier and customer categories
2018-02-12 04:07:45 +01:00
Laurent Destailleur
aaf4db2e03
Fix API on thirdparty categories
2018-02-12 04:05:51 +01:00
Ysandor
b48d369258
add the possibility to remove a category from a thirdparty
...
I don't know if there is a good reason for not proposing to unlink a thirdparty from a category but if it is not the case here is a piece of code allowing to remove a category that works for me and seems general enough to be useful to other people.
The new function is inspired from the addCategory function.
PS : This is the first time i'm trying to contribute on github so don't hesitate to tell me if I did something wrong.
2018-02-10 20:38:53 +01:00
Laurent Destailleur
26ee7ec5be
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/errors.lang
2018-02-08 17:27:36 +01:00
Laurent Destailleur
d10d9f0fb2
Fix scrutinizer
2018-02-08 17:22:07 +01:00
Laurent Destailleur
475b89bac1
Merge branch 'develop' into new_order_min_amount
2018-02-08 14:20:53 +01:00
Rui Strecht
8c732a1443
Trying to not include sql request into method setMysoc
2018-02-06 12:01:54 +00:00
Rui Strecht
31372f8948
Merge branch 'develop' into NEW_Show_Region_in_company_info_&_Global_option_to_show_state_code_MAIN_SHOW_STATE_CODE
...
# Conflicts:
# htdocs/core/class/commonobject.class.php
2018-02-06 10:26:38 +00:00
Laurent Destailleur
f57ea2682a
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/contrat/card.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/notify.class.php
htdocs/societe/class/societe.class.php
2018-02-03 19:33:24 +01:00
Regis Houssin
13106d34a6
Fix: compatibility with multicompany sharing
2018-02-02 12:36:47 +01:00
Laurent Destailleur
f6f57aa938
Missing Api for standing proposal/orders/invoices
2018-02-01 02:29:41 +01:00
Laurent Destailleur
14ecdce650
Fix merge of thirdparties (pb when merging codes and error management)
2018-01-31 18:01:56 +01:00
Rui Strecht
75b9caf744
Merge branch 'develop' into NEW_Show_Region_in_company_info_&_Global_option_to_show_state_code_MAIN_SHOW_STATE_CODE
2018-01-31 11:19:39 +00:00
Laurent Destailleur
d6317a26d2
Fix for multicompany
2018-01-30 15:48:09 +01:00
Maxime Kohlhaas
53e6da8c7c
Missing fetch and translation
2018-01-20 21:57:36 +01:00
Maxime Kohlhaas
6f248a6590
New allow to define order min amount
2018-01-20 20:17:56 +01:00
Laurent Destailleur
c29bfcef31
Merge pull request #8053 from Oeris/develop-api
...
FIX use DB PREFIX instead of llx_
2018-01-15 11:33:09 +01:00
Laurent Destailleur
68f0808d16
Update societe.class.php
2018-01-15 11:30:32 +01:00
Neil Orley
8d710020e9
FIX use DB PREFIX instead of llx_
2018-01-11 12:58:41 +01:00
Regis Houssin
157e118cba
Fix: broken feature
2018-01-11 10:47:40 +01:00
Laurent Destailleur
95312d1944
Fix regression
2018-01-11 10:20:49 +01:00
Laurent Destailleur
a4ab37e990
Remove deprecated field
2018-01-11 01:16:14 +01:00
Laurent Destailleur
4316793638
Merge pull request #8047 from hregis/develop_multicompany
...
Fix: some bugs with multicompany sharing
2018-01-11 01:07:17 +01:00
Laurent Destailleur
f2b8c3c97d
Fix check of customer/supplier code
2018-01-10 18:19:54 +01:00
Regis Houssin
8c3b4f62db
Fix: wrong entity with thirdparty sharing
2018-01-10 13:30:57 +01:00
Laurent Destailleur
cda078ce26
Fix test on email unique
2018-01-10 12:27:11 +01:00
Laurent Destailleur
ebc76b5f27
Fix tooltips on thirdparty and invoice
2018-01-04 18:29:12 +01:00
Laurent Destailleur
aad0da2513
Fix maxi debug of APIs (clean output fields)
2017-12-21 16:50:18 +01:00
Laurent Destailleur
016be9139b
Fix sql request
2017-12-19 17:09:47 +01:00
Laurent Destailleur
1351a43a30
FIX Maxi debug of permission for users external or restricted to sales
...
representatives
2017-12-18 16:13:05 +01:00
Laurent Destailleur
472d7b591e
Fix hook for formmail and translation
2017-12-10 02:01:36 +01:00
Laurent Destailleur
2693e5db6d
Fix the trigger COMPANY_MODIFY provide information of thirdparty merged
2017-11-29 16:24:58 +01:00
Laurent Destailleur
77509ee37a
Removed deprecated apis
2017-11-25 13:14:28 +01:00
Laurent Destailleur
80bdb45be8
Look and feel v6 - Show status of thirdparty in dol_banner
2017-11-18 01:48:16 +01:00
Laurent Destailleur
742bf29c65
Look and feel v6 - Show status of thirdparty in dol_banner
2017-11-18 01:29:42 +01:00
Laurent Destailleur
11cc82e6d2
Update doc
2017-11-10 10:15:50 +01:00
Laurent Destailleur
a72703d316
Fix deprecated code
2017-11-03 17:29:25 +01:00
Laurent Destailleur
c479efa480
Fix encoding with select2
2017-11-03 16:29:23 +01:00
Laurent Destailleur
4381c35835
Standardize code
2017-11-03 11:42:40 +01:00
Laurent Destailleur
1b28c45e2c
PERF Links in getNomUrl use only one tag a instead of 2.
2017-11-02 15:19:14 +01:00
Laurent Destailleur
adc4db0f85
Standardize code
2017-10-28 16:55:25 +02:00
Laurent Destailleur
ee1996ad37
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
2017-10-27 01:16:51 +02:00
Laurent Destailleur
6a9837528e
Merge pull request #7703 from Oeris/develop-api
...
FIX Data related to customer moved to thirparties api
2017-10-27 00:42:10 +02:00
Laurent Destailleur
a741a6bb3e
Update api_thirdparties.class.php
2017-10-27 00:41:56 +02:00
Laurent Destailleur
202712be94
Work on module builder
2017-10-25 22:02:07 +02:00
Neil Orley
3e53a2ecff
FIX merging conflict
2017-10-25 14:52:33 +02:00
Neil Orley
0f98572c2b
FIX Filter didn't work for credit note
...
Modify the SQL request to be able to filter on credit note
2017-10-25 14:04:36 +02:00
Neil Orley
cb71e921fd
NEW Get credit notes or deposits of a thirdparty
...
Ability to filter : available or applied
Returns a list of credit notes or deposits
2017-10-25 11:39:23 +02:00
Neil Orley
327f31611c
FIX Data related to customer moved to thirparties api
...
Related to commit : b6825703b4
2017-10-24 14:21:22 +02:00
Laurent Destailleur
f4f47c6732
NEW Remove tooltip tipTip library replaced with standatd jquery tooltip
2017-10-22 21:15:08 +02:00
Laurent Destailleur
c6e5115d34
Set default limit to 100 on all rest api that list
2017-10-22 15:42:19 +02:00
Laurent Destailleur
98674f6d82
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fourn/facture/card.php
htdocs/societe/class/api_contacts.class.php
htdocs/societe/class/api_thirdparties.class.php
2017-10-22 15:01:35 +02:00
Laurent Destailleur
79279caa2e
FIX #7619
2017-10-22 14:56:00 +02:00
Laurent Destailleur
745c4625a6
FIX #7619
2017-10-22 14:48:42 +02:00
Laurent Destailleur
69b131b919
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/card.php
htdocs/societe/class/api_thirdparties.class.php
2017-10-18 11:28:20 +02:00
Laurent Destailleur
235817c581
Fix missing default limit
2017-10-17 12:02:58 +02:00
BackrndSource
fdcab4c6e1
Update societe.class.php
...
fix error for function update()
Now it updates the note_public and note_private.
2017-10-16 17:16:44 +02:00
Rui Strecht
447cc208fe
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_Show_Region_in_company_info_&_Global_option_to_show_state_code_MAIN_SHOW_STATE_CODE
...
# Conflicts:
# htdocs/societe/class/societe.class.php
2017-10-16 09:34:24 +01:00
Scrutinizer Auto-Fixer
165741517e
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2017-10-13 11:28:26 +00:00
Laurent Destailleur
7c29bb5818
Fix must use differently FRST and SEPA
2017-10-12 01:24:19 +02:00
Laurent Destailleur
15bcbc8b43
FIX Check on bank info for sepa must be done on iban/swift not on ban
2017-10-12 00:38:59 +02:00
Laurent Destailleur
8674867db2
Fix creation/edit rum number
2017-10-11 23:43:42 +02:00
Regis Houssin
f2d9288db5
NEW add company alias name when create company from member
2017-10-09 12:38:44 +02:00
Rui Strecht
1a5cdf2406
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_Show_Region_in_company_info_&_Global_option_to_show_state_code_MAIN_SHOW_STATE_CODE
...
# Conflicts:
# htdocs/admin/company.php
# htdocs/core/class/commonobject.class.php
2017-10-09 11:36:38 +01:00
Regis Houssin
45de1ca21e
Fix: check security
2017-10-03 19:09:46 +02:00
Regis Houssin
4537e5472b
Fix: refactorization of "getListForItem" function
2017-10-03 19:01:54 +02:00
Regis Houssin
f8f4ff6d21
Fix: missing include api_categories class
2017-10-03 13:07:07 +02:00
Rui Strecht
4839d0f84d
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_Show_Region_in_company_info_&_Global_option_to_show_state_code_MAIN_SHOW_STATE_CODE
2017-09-28 09:36:52 +01:00
Laurent Destailleur
fdc1aa2a03
NEW Move contacts of a thirdparty on tab Contacts/Addresses
2017-09-27 19:56:03 +02:00
Laurent Destailleur
f1a563625b
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/actions_massactions.inc.php
htdocs/install/mysql/migration/5.0.0-6.0.0.sql
2017-09-26 22:11:00 +02:00
Laurent Destailleur
76f1dbe16b
FIX #7288
2017-09-26 12:25:26 +02:00
Rui Strecht
24f8ea003a
Added self to contributors list
2017-09-20 12:30:59 +01:00
Rui Strecht
f1126b65bf
Updated method to fetch state name, code and id to match method used with country
...
Reverted some previous changes to allow backwards compatibility
Extended MAIN_SHOW_REGION_IN_STATE to include showing region in thirdparty card
2017-09-20 12:06:35 +01:00
Laurent Destailleur
0fec777d0e
NEW On bulk email from a list, can uncheck "Join main document".
...
NEW Show direct preview link on contract
2017-09-16 18:31:30 +02:00
Laurent Destailleur
5e34b121dd
Add more robust php unit to detect not escaped sql. Fix not escaped sql
2017-09-15 15:41:07 +02:00
Laurent Destailleur
2390d20232
Update travis
2017-09-14 09:56:02 +02:00
Laurent Destailleur
fcf82f1163
Enhancement into setup of member module
2017-09-12 11:17:23 +02:00
Regis Houssin
092b87bbda
Fix: add llx_actioncomm in $childtablesoncascade
2017-09-11 13:36:03 +02:00
Regis Houssin
f8938f308d
Fix: remove table prefix
2017-09-11 08:17:25 +02:00
Laurent Destailleur
e7abb39ee2
NEW Template invoices are visible on the customer tab
2017-09-10 19:28:20 +02:00
Laurent Destailleur
c315ad7801
Fix missing tables into childtables
2017-09-10 18:04:13 +02:00
Laurent Destailleur
2db71cb773
Fix missing tables into childtables
2017-09-10 18:01:20 +02:00
Laurent Destailleur
14f41493bb
NEW Show country and vat number into company tooltip
2017-09-03 20:49:36 +02:00
Laurent Destailleur
084ea049d8
Minor bugs
2017-09-03 16:07:21 +02:00
Laurent Destailleur
ec0d277123
Code comment
2017-09-03 00:46:28 +02:00
Laurent Destailleur
a6a5602572
NEW Can set email of thirdparty as unique and/or mandatory
2017-09-02 12:36:53 +02:00
Regis Houssin
9430952561
Fix: missing entity filter (multicompany)
2017-07-12 11:00:18 +02:00
Laurent Destailleur
252d8da8fc
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/categories/class/categorie.class.php
htdocs/core/class/commondocgenerator.class.php
htdocs/core/lib/functions.lib.php
htdocs/core/modules/DolibarrModules.class.php
htdocs/filefunc.inc.php
htdocs/societe/class/societe.class.php
htdocs/supplier_proposal/class/supplier_proposal.class.php
2017-07-07 15:11:53 +02:00
Laurent Destailleur
a5cfd7c2e2
FIX Error when updating thirdparty not returned
2017-07-01 16:24:33 +02:00
Laurent Destailleur
e8b33e3dba
To provide solution to get thirdparty when name is not unique.
...
Conflicts:
htdocs/societe/class/societe.class.php
2017-06-29 15:38:39 +02:00
Laurent Destailleur
2f8c0bb555
Revert "To provide solution to get thirdparty when name is not unique."
...
This reverts commit 58328d36b3 .
2017-06-29 15:36:39 +02:00
Laurent Destailleur
58328d36b3
To provide solution to get thirdparty when name is not unique.
2017-06-29 15:32:36 +02:00
Laurent Destailleur
63dcdc3a03
Fix API was loading definition of all APIs at each call.
2017-06-25 17:09:08 +02:00
Regis Houssin
9410466d72
Fix: better check and security
2017-06-15 21:51:31 +02:00
Laurent Destailleur
4009b1837c
Fix permissions
2017-06-15 11:17:02 +02:00
Laurent Destailleur
7587a3d592
Merge branch 'develop' into develop_transverse
2017-06-08 10:25:04 +02:00
Regis Houssin
b183c6e7ac
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_transverse
2017-06-07 20:23:24 +02:00
Regis Houssin
2b36135641
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_mc
2017-06-07 20:14:03 +02:00
Laurent Destailleur
1820649175
Maxi debug of v6
2017-06-07 19:28:31 +02:00
Regis Houssin
b66da3d148
New: big refactorization of multicompany transverse mode
2017-06-06 10:23:33 +02:00
Regis Houssin
5c5663c5ae
New: getEntity function use true $shared value by default
2017-05-30 18:50:54 +02:00
Laurent Destailleur
e5fe629a0e
NEW Extrafields support formulas to be computed using PHP expressions
2017-05-24 22:48:44 +02:00
Laurent Destailleur
160eb194ea
Clean REST response for user and third parties
2017-05-24 15:24:35 +02:00
Laurent Destailleur
f5e29d6c86
Fix phpcs warning
2017-05-22 10:45:02 +02:00
Laurent Destailleur
6e31de731b
Fix phpunit
2017-05-21 20:24:56 +02:00
Laurent Destailleur
b29f325fcf
Work on search criteria persistence
2017-05-16 23:38:23 +02:00
Laurent Destailleur
fa290c34fa
Fix against SQL injection. Add phpunit to detect missing escapement.
2017-05-12 16:55:11 +02:00
Laurent Destailleur
5a31d2c95a
Fix css
2017-05-10 13:39:00 +02:00
Laurent Destailleur
865c8140d1
Clean code
2017-04-30 03:23:06 +02:00
Laurent Destailleur
9447b2a38b
Merge pull request #6658 from dolibarr95/patch-10
...
Fix typo
2017-04-11 11:07:24 +02:00
Laurent Destailleur
52c86cb3f5
NEW Bulk actions available on supplier orders
2017-04-09 13:12:25 +02:00
dolibarr95
8154521a22
Fix typo
...
Fix typo error in trigger name.
2017-04-07 14:15:36 +02:00
Laurent Destailleur
12375be14a
Merge pull request #6593 from dolibarr95/patch-5
...
NEW : Create a trigger for company rib update
2017-04-06 23:29:06 +02:00
Laurent Destailleur
536afb44c7
Merge pull request #6599 from defrance/patch-2
...
NEW : SOCIETE_ADD_REF_IN_LIST more display case GetNomUrl
2017-03-31 17:44:31 +02:00
Laurent Destailleur
01a74a8d23
Work on 6.0 look and feel
2017-03-31 17:41:20 +02:00
dolibarr95
6bd112db5e
Unify the trigger name
...
Should be COMPANY_RIB_MODIFY instead of COMPANY_RIB_UPDATE
2017-03-30 14:49:40 +02:00
dolibarr95
80715ec61b
Return -1 instead of 0 if error
2017-03-28 14:50:01 +02:00
Laurent Destailleur
41063e7cf2
Fix: trigger for delete must be before delete of element
2017-03-28 12:55:20 +02:00
BENKE Charlie
6ee1c79f6f
SOCIETE_ADD_REF_IN_LIST more display case GetNomUrl
...
0 = only socname (usual)
1 = socname and code_customer and supplier (like before)
2 = only code customer
3 = only code supplier
2017-03-27 18:26:24 +02:00
dolibarr95
17e5279907
Create a trigger for company rib delete
2017-03-27 14:00:05 +02:00
dolibarr95
262d1d5f8c
Create a trigger for company rib create
2017-03-27 09:19:46 +02:00
Laurent Destailleur
b9a9997688
Page societe/soc.php and compta/facture.php was renamed into card.php
...
to match page naming conventions.
2017-03-20 21:29:22 +01:00
Laurent Destailleur
4831fb4dcb
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/class/adherent.class.php
htdocs/filefunc.inc.php
2017-03-19 11:26:49 +01:00
Laurent Destailleur
dfc1ed7d72
FIX #6535
2017-03-16 22:49:02 +01:00
dolibarr95
0721e6af42
add condition
...
add condition check for $notrigger
2017-03-15 10:37:08 +01:00
dolibarr95
688073dc18
Create a trigger for company create RIB
...
Since there no 'trigger' executed when we create a RIB for a company (COMPANY_CREATE, COMPANY_MODIFY, COMPANY_DELETE not executed), I purpose a new one COMPANY_RIB_CREATE. If this PR is qualified i will purpose COMPANY_RIB_MODIFY and COMPANY_RIB_DELETE too.
tks
2017-03-15 10:31:45 +01:00
Laurent Destailleur
5f79b2d0c6
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/admin/account.php
htdocs/accountancy/admin/categories.php
htdocs/expensereport/class/expensereport.class.php
htdocs/install/mysql/migration/4.0.0-5.0.0.sql
2017-03-05 22:11:35 +01:00
Laurent Destailleur
8ad9a9c9c8
doxygen
2017-03-03 15:15:21 +01:00
Laurent Destailleur
92d9eb3c5d
Several fix for a better management of #6424
2017-02-22 17:46:54 +01:00
florian HENRY
5ec01b3175
NEW : Can send email to multiple destinaries from mailform
2017-02-15 11:41:09 +01:00
Gustavo Novaro
febe95cd2e
$db attributte now be protected
2017-02-08 20:27:14 -03:00
Gustavo Novaro
e053308c6f
Code style
...
var to public
2017-02-08 17:24:11 -03:00
Laurent Destailleur
31c3398b7f
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/modules.php
2017-02-08 10:59:05 +01:00
Laurent Destailleur
dc0856413c
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
2017-02-08 10:57:02 +01:00
Laurent Destailleur
d7060b0c4b
FIX #6360
2017-02-02 03:14:21 +01:00
Laurent Destailleur
c3fb559d3b
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/modProduct.class.php
2017-02-01 20:58:17 +01:00
Laurent Destailleur
27caa586c2
Fix auto increment customer code must be done only if error is on
...
duplicate code
2017-01-28 12:36:53 +01:00
Laurent Destailleur
1878647d26
NEW Add statistics on supplier tab.
2017-01-23 20:54:52 +01:00
Laurent Destailleur
94249b7926
NEW Add statistics on tabs
2017-01-20 14:03:07 +01:00
Laurent Destailleur
a05132d26e
Fix PHP 7.1 error
2017-01-16 09:05:09 +01:00
Laurent Destailleur
d14e4dbaba
Fix pagination when MAIN_DISABLE_FULL_SCANLIST is on
2017-01-15 20:49:20 +01:00
Laurent Destailleur
6aa26e0f62
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/compta/paiement.php
htdocs/product/stock/massstockmove.php
htdocs/projet/info.php
htdocs/projet/tasks/time.php
htdocs/societe/class/societe.class.php
2017-01-13 16:49:18 +01:00
Laurent Destailleur
8d5c853267
FIX Protection so even if link is output for external user, links is
...
disabled.
2017-01-12 15:12:53 +01:00
Laurent Destailleur
c42b48636a
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/commande/class/api_commande.class.php
htdocs/core/class/CMailFile.class.php
htdocs/societe/class/api_contact.class.php
2017-01-12 11:06:24 +01:00
Laurent Destailleur
e802ff3385
Fix POO declaration
2017-01-12 10:57:15 +01:00
KiteAtao
3bb1756a13
Fix Contact Api for REST WebServices
2017-01-07 21:37:45 +01:00
Laurent Destailleur
da1d4d80f2
Fix return code REST similar for all api with POST
2016-12-23 02:09:26 +01:00
Laurent Destailleur
9e44eb0d15
Fix return code REST similar for all api with POST
2016-12-23 02:08:22 +01:00
Laurent Destailleur
1838670e31
Fix several security holes on api when used by external users
2016-12-07 19:02:39 +01:00
Laurent Destailleur
761a795294
Maxi debug on REST APIs
2016-12-05 13:31:29 +01:00
Laurent Destailleur
bd8f923cee
Several fixes in filter on lists
2016-11-29 22:52:16 +01:00
Laurent Destailleur
dd27a52a85
Fix several problems on new REST API on project/tasks
2016-11-19 16:08:27 +01:00
Laurent Destailleur
ad981a0f07
FIX the key for getEntity was different for same element.
2016-11-18 12:54:08 +01:00
Laurent Destailleur
220d81b350
Fix duplicate tooltips
2016-10-28 17:43:29 +02:00
Laurent Destailleur
43bf372cf7
Fix doxygen
2016-10-25 21:15:25 +02:00
Laurent Destailleur
f67863e1aa
NEW Can use any filter on all REST API to list.
2016-10-25 19:15:47 +02:00
Laurent Destailleur
6ef74b33c9
Uniformize code
2016-10-25 11:09:26 +02:00
Laurent Destailleur
b284bdd953
NEW #5896 More complete data on event sent by email (name in title,
...
emails list in details)
2016-10-24 02:02:30 +02:00
Laurent Destailleur
f93bca9be9
NEW Can see/make bank conciliation from transaction list
2016-10-21 17:00:31 +02:00
Laurent Destailleur
db3e3642b0
NEW Can generate SEPA mandate for each bank account of your customers
2016-10-06 00:14:25 +02:00
Laurent Destailleur
3efa0e411d
NEW Add a direct debit mandate PDF template.
2016-10-02 15:29:43 +02:00
Laurent Destailleur
a52ad545eb
Enhancement on module Direct Debit SEPA.
2016-10-02 13:03:45 +02:00
Laurent Destailleur
29634304fd
Merge pull request #5795 from atm-ph/fix_4.0_value_too_long
...
Fix fields too long for database
2016-09-28 17:58:57 +02:00
phf
058cf61ae0
Fix fields too long for database
2016-09-27 10:06:22 +02:00
Laurent Destailleur
d39d7d92c9
Uniformize code.
2016-09-26 02:13:58 +02:00
Laurent Destailleur
25c5f40bf1
Add css on picto status
2016-09-10 19:44:55 +02:00
Laurent Destailleur
7d056f6857
NEW Use small photo of user on all user links
2016-09-01 11:29:30 +02:00
Laurent Destailleur
d6d474f10d
Clean code for category management.
2016-08-29 21:31:27 +02:00
Regis Houssin
6e40f9e700
Merge remote-tracking branch 'dolibarr/develop' into develop_origin
...
Conflicts:
htdocs/core/class/html.form.class.php
Change-Id: I87bdc02d611c2978a5a8b427f0e1b718b6453b59
2016-08-25 10:15:26 +02:00