lvessiller
20aa1e29f6
NEW address column in company list
2020-12-01 09:58:55 +01:00
UT from dolibit
7b02aa4c38
Update checkVatService.xml
...
http -> https at
<wsdlsoap:address location="https://ec.europa.eu/taxation_customs/vies/services/checkVatService "/>
2020-12-01 09:28:24 +01:00
Scrutinizer Auto-Fixer
6df4954b20
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-12-01 01:41:19 +00:00
Laurent Destailleur
99e4aab46e
CSS
2020-11-30 20:31:22 +01:00
Laurent Destailleur
958893228a
Fix combo to add contact and status of contact on popup
2020-11-30 15:18:58 +01:00
Laurent Destailleur
574919de52
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
.travis.yml
htdocs/accountancy/bookkeeping/balance.php
htdocs/adherents/class/subscription.class.php
htdocs/compta/bank/categ.php
htdocs/compta/facture/class/facture.class.php
htdocs/core/boxes/box_task.php
htdocs/core/class/commondocgenerator.class.php
htdocs/core/class/interfaces.class.php
htdocs/core/lib/project.lib.php
htdocs/core/modules/modCategorie.class.php
htdocs/expensereport/class/expensereport.class.php
htdocs/fichinter/class/fichinterrec.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/install/repair.php
htdocs/main.inc.php
htdocs/product/price.php
htdocs/projet/tasks/time.php
htdocs/reception/card.php
2020-11-27 15:45:12 +01:00
Laurent Destailleur
ac3c129735
Clean code
2020-11-27 14:24:15 +01:00
Laurent Destailleur
42c30584f4
Merge pull request #15522 from frederic34/patch-15
...
Update api_thirdparties.class.php
2020-11-25 12:53:36 +01:00
Laurent Destailleur
7bb6b24b96
Merge pull request #15505 from ptibogxiv/patch-394
...
Fix api contact
2020-11-25 12:52:45 +01:00
Frédéric FRANCE
9203cb1d88
fix api generateBankAccountDocument
2020-11-25 00:16:36 +01:00
Frédéric FRANCE
ba3ba7dd06
Update api_thirdparties.class.php
...
The variable $errors does not exist. Did you maybe mean $error?
2020-11-24 23:19:19 +01:00
ptibogxiv
51eed3efe5
Fix api contact
2020-11-24 12:03:31 +01:00
Laurent Destailleur
df09fc0d0c
Merge pull request #15482 from ptibogxiv/patch-392
...
Fix contact API
2020-11-24 09:08:10 +01:00
stickler-ci
11704ea6fb
Fixing style errors.
2020-11-23 22:33:45 +00:00
ptibogxiv
0d50402803
Update api_contacts.class.php
2020-11-23 23:31:46 +01:00
stickler-ci
c1ba61e548
Fixing style errors.
2020-11-23 21:55:36 +00:00
ptibogxiv
f227d5e72a
Update api_contacts.class.php
2020-11-23 22:53:56 +01:00
Givriz
dca4cf5987
Feature : ajout de la class "button-cancel"
...
Ajout de la class "button-cancel" suite à l'issue #3756 et achèvement de ma tâche Dolibarr.
2020-11-23 15:12:52 +01:00
Laurent Destailleur
2f6f242d99
CSS
2020-11-23 12:29:38 +01:00
ptibogxiv
28e4be3b0e
Fix contact API
...
Get roles by API (without GET this data, we can't add this to POST, so data was deleted 👎 )
2020-11-22 16:25:38 +01:00
Givriz
c48129e279
Ajout de la class "button-save"
...
Ajout de cette class sur les boutons pour pour cloturer une issue ouverte (feature)
2020-11-19 20:23:38 +01:00
Laurent Destailleur
2cbb1c09d5
Add missing token
2020-11-18 13:18:47 +01:00
Laurent Destailleur
c5929a62b7
Fix token
2020-11-18 13:17:53 +01:00
kamel
709822635c
Correction Stickler CI
2020-11-18 09:46:23 +01:00
kamel
73b35f334e
NEW: Add new option for displaying Contact email (or phones if not defined) and town info list (select list or combobox)
...
Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
2020-11-18 09:41:42 +01:00
Laurent Destailleur
ad04646c05
Fix must use json_encode/decode instead of dol_json_encode/decode
2020-11-11 15:56:19 +01:00
Laurent Destailleur
6536208a14
Merge pull request #15322 from OPEN-DSI/new-list-include-array-extra-fields-with-langfile
...
NEW include tpl for loading lang file for extra fields in list
2020-11-10 14:42:21 +01:00
Laurent Destailleur
47b3b30aaa
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/card.php
htdocs/fourn/product/list.php
htdocs/product/fournisseurs.php
htdocs/societe/card.php
2020-11-10 11:10:35 +01:00
Laurent Destailleur
73df033000
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/accountancy/journal/bankjournal.php
htdocs/core/boxes/box_birthdays.php
2020-11-10 11:05:53 +01:00
Scrutinizer Auto-Fixer
f6e3f58fcb
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-11-09 14:18:56 +00:00
Got2be
2f11f4e104
FIX : disabled users must not be available in sales representative list on societe edit mode
2020-11-09 11:22:07 +01:00
Laurent Destailleur
a9fbe9dd6c
Fix remove warning
2020-11-08 00:18:41 +01:00
Laurent Destailleur
eba73101b9
Merge pull request #15210 from frederic34/zapieruser
...
work on zapier
2020-11-06 18:49:23 +01:00
lvessiller
4ddff7173f
NEW include tpl for loading lang file for extra fields in list
2020-11-06 12:19:45 +01:00
atm-lena
047785b273
FIX - Don't display inactive users in birthday box and soc card
2020-11-06 11:58:36 +01:00
Frédéric FRANCE
5940fb1391
doxygen
2020-11-05 23:03:44 +01:00
Frédéric FRANCE
b534dd57d9
Merge remote-tracking branch 'upstream/develop' into zapieruser
2020-11-05 08:29:35 +01:00
Frédéric FRANCE
6e7448a1d0
Merge remote-tracking branch 'upstream/develop' into zapieruser
2020-11-04 19:00:10 +01:00
Laurent Destailleur
bd596965ef
Update card.php
2020-11-04 18:54:56 +01:00
Frédéric FRANCE
7d878d47fa
Update card.php
2020-11-04 09:50:36 +01:00
Laurent Destailleur
83a7b19333
Look and feel v13
2020-11-02 11:41:07 +01:00
Frédéric FRANCE
49390a596c
Merge remote-tracking branch 'upstream/develop' into zapieruser
2020-10-31 20:33:59 +01:00
Scrutinizer Auto-Fixer
ab25e047c0
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-31 17:51:30 +00:00
Frédéric FRANCE
be4a4cb54b
Merge remote-tracking branch 'upstream/develop' into zapieruser
2020-10-31 16:10:16 +01:00
Frédéric FRANCE
8bf2b1797c
tabs
2020-10-31 15:59:33 +01:00
Scrutinizer Auto-Fixer
7f52920716
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-31 13:32:18 +00:00
Laurent Destailleur
1af3709793
Merge pull request #15232 from frederic34/patch-6
...
doxygen
2020-10-31 13:50:28 +01:00
Frédéric FRANCE
c4a7e58435
Update societe.class.php
2020-10-31 13:22:04 +01:00
Frédéric FRANCE
ae351a5659
doxygen
2020-10-31 13:13:55 +01:00
Frédéric FRANCE
72c443868c
Update api_thirdparties.class.php
2020-10-31 11:57:35 +01:00
Frédéric FRANCE
25741a618e
fix result is a resource
2020-10-31 09:50:50 +01:00
Frédéric FRANCE
0b9c866825
Merge remote-tracking branch 'upstream/develop' into zapieruser
2020-10-31 09:08:07 +01:00
Frédéric FRANCE
bdfc164130
Merge remote-tracking branch 'upstream/develop' into apiclean
2020-10-30 18:02:58 +01:00
Frédéric FRANCE
8190711342
doxygen
2020-10-30 18:01:01 +01:00
Frédéric FRANCE
2cbbf86a5b
Merge remote-tracking branch 'upstream/develop' into zapieruser
2020-10-30 17:48:00 +01:00
Frédéric FRANCE
782e062ec7
Update api_thirdparties.class.php
2020-10-30 15:24:29 +01:00
Frédéric FRANCE
ace1dc16f1
Merge remote-tracking branch 'upstream/develop' into zapieruser
2020-10-30 14:47:09 +01:00
Laurent Destailleur
64b9afc509
Fix bad column name
2020-10-30 14:33:16 +01:00
Frédéric FRANCE
e4af61a587
Merge remote-tracking branch 'upstream/develop' into zapieruser
2020-10-30 08:17:53 +01:00
Laurent Destailleur
a24071492e
Start fix for php8 compatibility
2020-10-30 05:56:07 +01:00
Frédéric FRANCE
30b67aaa4f
get thirdparty specimen with api
2020-10-29 23:56:42 +01:00
Laurent Destailleur
8c646cdf4f
Merge pull request #15207 from frederic34/patch-11
...
Mutualise code, introduce MAIN_ALL_TOWN_TO_UPPER
2020-10-29 17:49:16 +01:00
Regis Houssin
1c7d293a93
FIX wrong check operator
2020-10-29 10:10:10 +01:00
Frédéric FRANCE
fcb343e891
Update societe.class.php
2020-10-28 20:53:29 +01:00
Frédéric FRANCE
0ff32c7074
Update societe.class.php
2020-10-27 20:50:11 +01:00
Frédéric FRANCE
4f3b732ed5
Update societe.class.php
2020-10-27 20:14:42 +01:00
Scrutinizer Auto-Fixer
a2a9c51e50
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-27 18:46:07 +00:00
Frédéric FRANCE
5a3780e062
end of dol_fiche_end
2020-10-27 18:19:31 +01:00
Marc de Lima Lucio
496c31d63a
NEW: ref in product customer price: add field in forms and form handlers
2020-10-26 12:18:24 +01:00
Marc de Lima Lucio
c2518e92fb
NEW: ref in product customer price: add field in views
2020-10-26 11:50:04 +01:00
Florian HENRY
457f8b9766
fix bad link index thirdparty
2020-10-26 10:49:07 +01:00
Laurent Destailleur
cd4d738a56
Merge branch 'translateModLivraison2ModDelivery' of
...
https://github.com/orebd/dolibarr into develop
# Conflicts:
# htdocs/install/mysql/migration/12.0.0-13.0.0.sql
2020-10-25 16:01:18 +01:00
ptibogxiv
ac800473c3
Update list.php
2020-10-24 12:46:13 +02:00
ptibogxiv
14e67b6536
Fix takeposlist thirdparty
...
exclude only supplier thirdparties for more efficient search
2020-10-24 11:16:36 +02:00
Frédéric FRANCE
9a470fa42d
replace deprecated
2020-10-22 22:50:03 +02:00
stickler-ci
18b71e2fa6
Fixing style errors.
2020-10-18 13:38:00 +00:00
ptibogxiv
e1a7de32e1
NEW add alert before change thirdparty in takepos
...
With some prices rules, change thirdparty should only done before add products to draft invoice.
We can't block it but display an alert can be done for users
2020-10-18 15:36:04 +02:00
Laurent Destailleur
7b20e703ee
Clean code
2020-10-17 15:53:31 +02:00
Laurent Destailleur
4a3dc6ecb3
Fix syntax error
2020-10-16 17:40:19 +02:00
Laurent Destailleur
27282d7e3d
FIX Include the ticket and mo table in merge process of thirdparty
2020-10-16 17:08:23 +02:00
Laurent Destailleur
e74b833d7f
Look and feel v13
2020-10-16 15:40:52 +02:00
Florian HENRY
0cb04d14d7
NEW: Thirdparty module : box on customer/supplier tab for outsantding amount late
2020-10-15 12:20:37 +02:00
Laurent Destailleur
a0b17635fd
NEW When creating a user from a member linked to a thirdparty, you can
...
decide if it is an internal or external (default) user.
2020-10-14 14:02:07 +02:00
Alexandre SPANGARO
ca7ad35342
Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport
2020-10-09 06:39:42 +02:00
Aurélien
b6283c1a5d
Merge remote-tracking branch 'upstream/develop' into translateModLivraison2ModDelivery
2020-10-08 16:19:10 +02:00
Laurent Destailleur
ed3a4de438
Fix security hole
2020-10-08 14:30:59 +02:00
Scrutinizer Auto-Fixer
1512521d91
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-07 13:01:28 +00:00
AurelienBinard
39d538befc
Merge branch 'develop' into translateModLivraison2ModDelivery
2020-10-06 16:20:25 +02:00
Laurent Destailleur
e3542c6d4f
Merge pull request #14848 from TobiasSekan/ShowCategoryInListOnlyWithRights
...
NEW Show category filter on lists only when user have rights to read categories
2020-10-06 12:29:10 +02:00
Laurent Destailleur
7c6c319607
Trans
2020-10-06 09:31:54 +02:00
Aurélien
bdd095f6bb
translate livraison2delivery => change folder, filename and class ref into all dependencies #14697
2020-10-05 13:59:59 +02:00
Laurent Destailleur
b15d862f36
Merge pull request #14870 from atm-john/12.0_add_filters_on_tab_soc_price
...
ADD : Filters more filters on customer price tab
2020-10-02 15:40:52 +02:00
Laurent Destailleur
500ef243e2
Merge pull request #14815 from ptibogxiv/patch-365
...
NEW restrict thirdparty to customer in takepos
2020-10-02 14:41:11 +02:00
Laurent Destailleur
ce1c5c6873
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/stripe/class/stripe.class.php
htdocs/takepos/invoice.php
2020-10-01 19:43:23 +02:00
ptibogxiv
4e16db1e5f
Update paymentmodes.php
2020-10-01 12:22:53 +02:00
Laurent Destailleur
7b3a7c9921
Add token on all url with action=delete
2020-10-01 10:50:54 +02:00
Laurent Destailleur
f442dac2c9
Add token on most GET url for admin action
2020-09-30 15:13:28 +02:00
John Botella
1131eb240d
Fix lang trans
2020-09-30 13:36:03 +02:00
geoffrey.girard
8c017ad422
ADD : Filters more filters on customer price tab
2020-09-30 13:33:05 +02:00
ptibogxiv
8bef390d60
Update list.php
2020-09-29 17:09:45 +02:00
Sekan, Tobias
2bf15b3a92
Show category filter only on rights to read it
2020-09-28 10:42:49 +02:00
Florian HENRY
f9d4a4d2ba
Merge branch 'develop' into fix_eventcreation
2020-09-27 17:58:05 +02:00
Laurent Destailleur
68a6239322
Clean code
2020-09-26 04:25:14 +02:00
Laurent Destailleur
1b83b55995
Fix to exclude possible sql injection
2020-09-25 17:11:54 +02:00
Laurent Destailleur
3c6dda9dd5
Clean code
2020-09-25 10:27:30 +02:00
stickler-ci
3c48d2933c
Fixing style errors.
2020-09-24 08:08:15 +00:00
ptibogxiv
6a85fdbd7f
Update list.php
2020-09-24 10:06:35 +02:00
ptibogxiv
ca07b19796
Update list.php
2020-09-23 22:39:24 +02:00
stickler-ci
e037f2e5c7
Fixing style errors.
2020-09-23 07:11:59 +00:00
Tobias Sekan
a72519f353
Merge branch 'develop' into PreselectThirpartyOnNewFromList
2020-09-23 09:09:42 +02:00
Sekan, Tobias
638c586a05
Merge branch 'PreselectThirpartyOnNewFromList' of https://github.com/TobiasSekan/dolibarr into PreselectThirpartyOnNewFromList
2020-09-23 08:59:45 +02:00
Sekan, Tobias
ce6758657a
Fix visiblity when came from Extended POS + doc
2020-09-23 08:59:30 +02:00
Florian HENRY
1efec17228
remove commented code since 3 years
2020-09-21 11:53:09 +02:00
Florian HENRY
0adca0a660
fix event creation same on all page
2020-09-21 11:43:08 +02:00
Laurent Destailleur
906e030bfb
Removed warning
2020-09-20 21:25:18 +02:00
Laurent Destailleur
2137901b0b
Fix sanitizing
2020-09-20 20:49:26 +02:00
Laurent Destailleur
ba69fab76a
Merge pull request #14780 from ptibogxiv/patch-363
...
NEW fetch contact by email with REST API
2020-09-20 17:17:03 +02:00
Laurent Destailleur
4f2623ee81
Merge pull request #14779 from ptibogxiv/patch-362
...
NEW create thirdparty customer from TAKEPOS
2020-09-20 17:16:38 +02:00
Laurent Destailleur
e5cca13ea0
Fix escaping
2020-09-20 03:32:43 +02:00
Laurent Destailleur
216b3c885d
Fix escaping
2020-09-20 01:30:36 +02:00
stickler-ci
f9b4a0f68b
Fixing style errors.
2020-09-18 15:54:37 +00:00
ptibogxiv
206b1189c9
NEW fetch contact by email with REST API
2020-09-18 17:52:48 +02:00
Laurent Destailleur
4e2aff2cdc
Fix sql injection when forging requests with IN
2020-09-18 17:28:02 +02:00
stickler-ci
b41bfd502a
Fixing style errors.
2020-09-18 12:50:53 +00:00
ptibogxiv
1c65fa0c5d
NEW create thirdparty customer from TAKEPOS
...
avoid to switch to backend dolibarr then return to takepos (not really ergonomic and userfriendly)
2020-09-18 14:48:47 +02:00
Tobias Sekan
b2a953ed5b
Merge branch 'develop' into PreselectThirpartyOnNewFromList
2020-09-18 12:21:41 +02:00
Sekan, Tobias
ae8c302c19
merge variable declaration
2020-09-18 10:52:17 +02:00
Sekan, Tobias
dc4250aed7
Make button visiblity identical on most lists
2020-09-18 10:46:23 +02:00
Sekan, Tobias
1b04ef8aad
Add function to all list that support $socid
2020-09-18 10:36:40 +02:00
Laurent Destailleur
b35db6b9dd
Clean code managing canvas
2020-09-18 06:02:52 +02:00
Laurent Destailleur
c4b5f5a249
Maxi clean of code
2020-09-18 01:29:17 +02:00
Laurent Destailleur
5e3f6ce736
Merge pull request #14749 from TobiasSekan/UseNewTableFunctionAndCleanup
...
Use new table function for comm/propal + cleanup
2020-09-17 11:20:31 +02:00
Laurent Destailleur
bfbb217607
Fix GETPOST on 'action'
2020-09-16 19:39:50 +02:00
Sekan, Tobias
ac1fdb4a59
Use new table function for comm/propal + cleanup
2020-09-16 10:51:19 +02:00
Laurent Destailleur
e5191cad24
Move code of incoterm into the Incoterm Trait.
2020-09-16 02:50:18 +02:00
Laurent Destailleur
26b4fb3e68
Update list.php
2020-09-14 00:22:58 +02:00
bahfir abbes
ef0b84a507
allow external users to see thirdparties with printFieldListWhere hook;
2020-09-12 16:40:18 +01:00
Laurent Destailleur
1f8278c8ca
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/balance.php
htdocs/core/class/html.formmail.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/langs/en_US/other.lang
htdocs/product/class/product.class.php
htdocs/supplier_proposal/class/supplier_proposal.class.php
2020-09-12 04:42:59 +02:00
Laurent Destailleur
5ea3f09e17
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/core/class/translate.class.php
2020-09-12 04:29:28 +02:00
Laurent Destailleur
f06737097f
Look and feel v13
2020-09-10 16:37:42 +02:00
Laurent Destailleur
b8fe2188a6
Standardize code around model_pdf
2020-09-10 01:49:09 +02:00
Laurent Destailleur
f5eb8b0108
Look and feel v13
2020-09-08 04:21:35 +02:00
Scrutinizer Auto-Fixer
b78ff67d7e
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-09-07 08:18:17 +00:00
John Botella
c17bc8b3c8
Fix missing param for hook
2020-09-03 10:45:03 +02:00
ptibogxiv
477f33f56c
NEW standardizes API thirdparties by email with other object
2020-08-31 21:45:51 +02:00
ptibogxiv
12676d020a
Update api_thirdparties.class.php
2020-08-29 11:43:56 +02:00
stickler-ci
26f812b73b
Fixing style errors.
2020-08-29 09:39:10 +00:00
ptibogxiv
a68d2fe91e
NEW API get thirdparty by barcode
2020-08-29 11:37:16 +02:00
ptibogxiv
00d619d08e
Update societe.class.php
2020-08-28 23:04:05 +02:00
ptibogxiv
8286978ce8
New fetch thirdparty by barcode
...
ie: usefull for fidelity card with barcode/qrcode
if this PR ok, i will push PR for get thirdparty by barcode and change thirdparty by barcode in takepos
2020-08-28 22:44:58 +02:00
Laurent Destailleur
ad87e753b4
Clean trim on GETPOST (already included inside GETPOST when not 'none'
2020-08-28 21:27:50 +02:00
Laurent Destailleur
c4c0b8afd4
Fix
2020-08-28 17:49:30 +02:00
bahfir abbes
a031a10f77
fix:option to see complete names of partners
2020-08-28 13:34:40 +01:00
Laurent Destailleur
d40f90fecb
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-08-27 22:00:38 +02:00
Laurent Destailleur
ad63434f3e
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/compta/prelevement/index.php
2020-08-27 22:00:10 +02:00
Laurent Destailleur
00fce1d18a
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-08-27 21:58:23 +02:00
Laurent Destailleur
4ecd15b7ab
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fourn/commande/card.php
htdocs/langs/en_US/main.lang
2020-08-27 21:57:42 +02:00
lvessiller
9268955256
FIX set sales representatives on create company card
2020-08-26 09:40:20 +02:00
Laurent Destailleur
23cda5f464
Enhance recruitment module
2020-08-22 14:37:09 +02:00
ptibogxiv
eba4d44c81
Fix Stripe icon in balance list
2020-08-20 20:24:00 +02:00
Laurent Destailleur
964c4ef0d2
Standardize code. Use model_pdf.
2020-08-18 14:48:38 +02:00
Alexandre SPANGARO
27c36713d3
Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport
2020-08-16 22:10:02 +02:00
Laurent Destailleur
aa699bacc6
css
2020-08-07 20:10:31 +02:00
Laurent Destailleur
04d18e2a68
css
2020-08-04 21:17:13 +02:00
Laurent Destailleur
fb811a1656
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/system/database-tables.php
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/core/class/commonobject.class.php
htdocs/langs/fr_FR/withdrawals.lang
htdocs/societe/class/societe.class.php
2020-08-03 14:44:01 +02:00
Laurent Destailleur
8c34acbf55
FIX Warning if no bank account defined
2020-08-03 14:11:15 +02:00
Laurent Destailleur
87f71e7681
FIX Look and feel v12
2020-08-02 22:36:14 +02:00
Laurent Destailleur
7297950308
Merge pull request #13759 from OPEN-DSI/stcommcontact
...
NEW: Add prospect status managment for the contact with managment of custom icon
2020-08-02 22:01:00 +02:00
Laurent Destailleur
75d8455789
Merge pull request #14328 from marc-dll/NEW_api_thirdparty_price_level
...
NEW: thirdparty REST API: endpoint to set price level
2020-08-02 01:20:05 +02:00
Marc DLL
5087d35f86
NEW: thirdparty REST API: endpoint to set price level
2020-07-31 17:48:44 +02:00
kkhelifa-opendsi
fe0f77b967
Merge branch 'develop' into stcommcontact
2020-07-31 16:41:17 +02:00
Laurent Destailleur
0928a5843b
Merge pull request #14300 from bafbes/abb110232
...
fix:fetch and update model_pdf attribute for societe
2020-07-29 13:11:51 +02:00
Laurent Destailleur
91a50038ff
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/compta/prelevement/create.php
htdocs/compta/prelevement/fiche-stat.php
2020-07-27 19:35:34 +02:00
abb
5aa4e2353a
fix:fetch and update model_pdf attribute for societe
2020-07-27 15:40:25 +01:00
Laurent Destailleur
573feed66f
FIX locataxes lost on lines when cloning a vendor invoice
2020-07-25 02:59:49 +02:00
Laurent Destailleur
87cd4b11bd
Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop
2020-07-19 02:24:38 +02:00
Laurent Destailleur
8d26329653
Merge branch '12.0' of https://github.com/dolibarr/dolibarr into develop
...
Conflicts:
htdocs/core/lib/price.lib.php
htdocs/projet/activity/perday.php
2020-07-19 02:24:26 +02:00
florian HENRY
045fbad616
fix extrafields linnktoObject Thirdpary option showAdress
2020-07-13 17:48:21 +02:00
Anthony Berton
dc8bce2f43
Update list.php
2020-07-10 11:42:59 +02:00
Laurent Destailleur
726d7e39e6
CSS
2020-07-10 02:17:08 +02:00
Laurent Destailleur
87913e8a5c
Fix prospect before customer
2020-07-10 02:11:23 +02:00
Alexandre SPANGARO
59ee22537d
Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport
2020-07-06 03:24:27 +02:00
Laurent Destailleur
1b2cea3f9f
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-07-05 13:32:10 +02:00
Laurent Destailleur
8df431f525
Look and feel v12
2020-07-05 13:30:56 +02:00
Laurent Destailleur
83eaddb17b
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/core/class/evalmath.class.php
htdocs/core/class/extrafields.class.php
htdocs/install/mysql/migration/11.0.0-12.0.0.sql
htdocs/langs/en_US/cashdesk.lang
htdocs/societe/class/societe.class.php
2020-07-04 13:13:17 +02:00
Laurent Destailleur
b88e159495
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/compta/facture/card.php
2020-07-03 00:46:18 +02:00
Laurent Destailleur
59049cd047
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-07-03 00:41:32 +02:00
Laurent Destailleur
ae0c738980
FIX Entry from stripe intent were reported into SEPA payments
...
FIX Label of popup on thirdparty
FIX Missing the tooltip when creating bank account
2020-07-01 19:42:28 +02:00
lvessiller
caa3661eeb
NEW add order by lastname and firstname by default in get sales representatives
2020-07-01 09:16:44 +02:00
lvessiller
918e669c98
FIX change selected fields on company card
2020-06-30 16:33:18 +02:00
lvessiller
ad36447295
NEW can edit and set sales representatives directly on thirdparty card
2020-06-26 12:20:53 +02:00
Laurent Destailleur
333d4873c3
Properties ->contactid has been renamed into ->contact_id
2020-06-25 12:17:47 +02:00
Laurent Destailleur
e146d0fe21
Fix url
2020-06-25 02:51:14 +02:00
Laurent Destailleur
d816d45331
Look and feel v13
2020-06-22 04:10:13 +02:00
Laurent Destailleur
01914980d9
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/public/notice.php
2020-06-19 00:45:06 +02:00
Laurent Destailleur
b9218a1c4c
Debug v12
2020-06-18 19:21:21 +02:00
Laurent Destailleur
6c2d70d43b
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-17 19:27:39 +02:00
Laurent Destailleur
13cdd5bc45
FIX #14095
2020-06-17 15:42:55 +02:00
Laurent Destailleur
90b5ed9908
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/website.lib.php
2020-06-11 23:41:35 +02:00
Laurent Destailleur
ee611fa7a0
Fix bad definition of field for parent
2020-06-11 18:32:05 +02:00
Laurent Destailleur
c289001507
Fix bad definition of field for parent
2020-06-11 18:31:26 +02:00
Laurent Destailleur
5b882e333d
Fix tooltip on localtaxes
2020-06-10 23:00:17 +02:00
Laurent Destailleur
ff9312c96a
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/prelevement/card.php
htdocs/compta/prelevement/class/ligneprelevement.class.php
htdocs/compta/prelevement/create.php
htdocs/compta/prelevement/line.php
2020-06-08 20:36:54 +02:00
Laurent Destailleur
c386f4b2e3
Maxi debug of direct debit order
2020-06-08 11:43:20 +02:00
Laurent Destailleur
7d3039d41f
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/admin.lang
htdocs/user/card.php
2020-06-06 23:04:55 +02:00
Laurent Destailleur
b386400365
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-06-06 21:52:55 +02:00
Laurent Destailleur
38d95aa5cd
Update societe.class.php
2020-06-06 21:45:53 +02:00
Laurent Destailleur
af440b7c49
Update societe.class.php
2020-06-06 21:32:25 +02:00
florian HENRY
0943b13ecc
Merge branch '11.0' of github.com:Dolibarr/dolibarr into 11.0
2020-06-06 17:51:31 +02:00
Laurent Destailleur
da672c8776
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/card.php
htdocs/admin/translation.php
htdocs/core/class/html.formfile.class.php
htdocs/societe/card.php
2020-06-06 11:57:31 +02:00
Laurent Destailleur
a305c43901
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/societe/card.php
htdocs/ticket/card.php
2020-06-06 11:51:39 +02:00
Laurent Destailleur
2344435416
Fix XSS CWE-ID CWE-79
2020-06-05 23:41:29 +02:00
stickler-ci
e9b17aac8d
Fixing style errors.
2020-06-04 18:20:48 +00:00
florian HENRY
7115bd7033
better fix
2020-06-04 20:14:19 +02:00
florian HENRY
2337d75d92
better fix for #13968
2020-06-01 10:43:57 +02:00
florian HENRY
face2d644e
Merge branch '11.0' of github.com:Dolibarr/dolibarr into 11.0
2020-06-01 10:05:07 +02:00
Laurent Destailleur
2836368017
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/extrafields.class.php
htdocs/filefunc.inc.php
htdocs/takepos/css/phone.css
htdocs/takepos/invoice.php
2020-05-28 20:20:39 +02:00
Laurent Destailleur
6cbb87f224
FIX #13995 #13994 manually.
2020-05-28 20:12:06 +02:00
Laurent Destailleur
8aba46a5ed
Fix doc
2020-05-27 23:08:33 +02:00
Laurent Destailleur
16625af34e
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.formfile.class.php
htdocs/core/lib/files.lib.php
htdocs/core/tpl/filemanager.tpl.php
2020-05-27 14:28:20 +02:00
Laurent Destailleur
c0ce584487
Look and feel v12
2020-05-27 00:26:04 +02:00
Laurent Destailleur
00484d5938
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-26 23:23:31 +02:00
Laurent Destailleur
9aeb79e80c
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-05-26 23:22:45 +02:00
Laurent Destailleur
e02aa4e41b
FIX Default bank account was not loaded for document generation.
2020-05-26 23:22:14 +02:00
florian HENRY
ceb0a5b0b5
space
2020-05-26 21:32:18 +02:00
florian HENRY
e5edc06f3d
spelling
2020-05-26 21:29:47 +02:00
florian HENRY
7ada0de654
FIX : #13968
2020-05-26 21:27:46 +02:00
Frédéric FRANCE
b41ac00b98
add new rule
2020-05-21 15:05:19 +02:00
Frédéric FRANCE
e5fc928fda
add new rule
2020-05-21 02:02:54 +02:00
Laurent Destailleur
8a6ae84fb0
Fix getStructuredData for organization
2020-05-17 20:02:01 +02:00
Laurent Destailleur
4a9960797b
responsive
2020-05-15 17:27:12 +02:00
Laurent Destailleur
c43813ccbb
Fix responsive of edition of thirdparties
2020-05-15 16:23:24 +02:00
Laurent Destailleur
5fe9c45fb2
Fix look and feel v12
2020-05-15 16:07:39 +02:00
Laurent Destailleur
b150edd6d0
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/societe/checkvat/checkVatPopup.php
2020-05-15 14:10:53 +02:00
Laurent Destailleur
d430b2896e
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-05-15 14:09:26 +02:00
Laurent Destailleur
987d3cf52e
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2020-05-15 14:04:58 +02:00
Alexandre SPANGARO
3811586cd0
FIX Site ec.europa.eu has moved to https://
2020-05-14 20:34:48 +02:00
Laurent Destailleur
4584fa1aa6
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/asset/list.php
htdocs/compta/bank/list.php
htdocs/contrat/services_list.php
htdocs/core/lib/date.lib.php
htdocs/expensereport/list.php
htdocs/fichinter/list.php
htdocs/holiday/list.php
htdocs/projet/tasks/list.php
htdocs/supplier_proposal/list.php
htdocs/user/list.php
2020-05-11 19:43:06 +02:00
Maxime Kohlhaas
1a9afe6b20
Fix missing hook params for printFieldListValue
2020-05-08 01:40:25 +02:00
Laurent Destailleur
206b16410e
Revert the option to avoid to introduce a feature that is duplicate with
...
already existing view "Events/Agenda". It also keeps a common behaviour
between other tools.
Maxi debug on messages of tickets
2020-05-07 22:52:32 +02:00
Laurent Destailleur
6d79eed8c1
Fix colspan alignement
2020-04-29 20:36:14 +02:00
kamel
218fbfc70b
Correction pour validation Stickler CI / stickler-ci
2020-04-27 18:06:50 +02:00
kamel
28d330996c
Correction pour validation Stickler CI / stickler-ci
2020-04-27 18:01:07 +02:00
kamel
9cb90cb384
NEW: Add prospect status managment for the contact with managment of custom icon
2020-04-27 17:35:14 +02:00
Laurent Destailleur
1c70e49695
Merge branch 'develop' into 12.0_a23
2020-04-27 14:14:13 +02:00
Laurent Destailleur
fe3359022a
Merge pull request #13747 from bb2a/patch-7
...
Link Phone in list
2020-04-27 13:49:30 +02:00
Laurent Destailleur
06cb0194d5
Look and feel v12
2020-04-26 14:12:51 +02:00
Laurent Destailleur
58409ce93e
Look and feel v12
2020-04-26 14:11:25 +02:00
Anthony Berton
62ca9a984e
Update list.php
2020-04-25 21:42:59 +02:00
Scrutinizer Auto-Fixer
1bf5745286
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-04-25 11:52:07 +00:00
Scrutinizer Auto-Fixer
548f3007cf
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-04-23 16:55:10 +00:00
Laurent Destailleur
bcad90ccf2
Merge pull request #13715 from ndrosis/patch-25
...
Fix check VAT ID HTTP to HTTPS
2020-04-23 18:22:39 +02:00
Laurent Destailleur
72c6ac1c72
Complete #13708 , normalization of code
2020-04-23 13:21:39 +02:00
Laurent Destailleur
8f8ae5a4db
Fix typo
2020-04-23 12:33:22 +02:00
Drosis Nikos
d11396be3e
Fix check VAT ID HTTP to HTTPS
...
No response to HTTP
2020-04-23 13:22:30 +03:00
Laurent Destailleur
18d3d68cae
Fix def
2020-04-23 12:22:24 +02:00
Laurent Destailleur
da02863242
Code comment
2020-04-23 12:19:51 +02:00
Laurent Destailleur
496d8f354f
Look and feel v12
2020-04-22 17:59:54 +02:00
Laurent Destailleur
16e46c672c
Clean code
2020-04-20 15:06:27 +02:00
Laurent Destailleur
7d9c10251c
Merge pull request #13622 from ptibogxiv/patch-330
...
NEW API filter contacts by category
2020-04-16 01:00:33 +02:00
stickler-ci
63fa83e0c6
Fixing style errors.
2020-04-15 17:25:49 +00:00
ptibogxiv
47069a0575
Update api_thirdparties.class.php
2020-04-15 19:24:16 +02:00
ptibogxiv
d56785e9dc
Update api_thirdparties.class.php
2020-04-15 19:23:04 +02:00
stickler-ci
ec84303e8c
Fixing style errors.
2020-04-15 17:05:37 +00:00
ptibogxiv
d05a00bd0a
Update api_thirdparties.class.php
2020-04-15 19:03:40 +02:00
ptibogxiv
d1957e1a05
Update api_thirdparties.class.php
2020-04-15 18:31:20 +02:00
ptibogxiv
03655ffe8d
Update api_contacts.class.php
2020-04-15 18:30:51 +02:00
stickler-ci
81bed88cb1
Fixing style errors.
2020-04-15 16:28:02 +00:00
ptibogxiv
9b100cb806
NEW API filter contacts by category
2020-04-15 18:26:07 +02:00
stickler-ci
78c5011a71
Fixing style errors.
2020-04-15 16:20:42 +00:00
ptibogxiv
864205771b
NEW API filter thirdparty by category
2020-04-15 18:18:20 +02:00
Josep Lluís
eda398b1cb
FIX translation key ErrorPrefixRequired
...
The correct translation key is ErrorPrefixRequired
2020-04-14 07:01:53 +02:00
Laurent Destailleur
0878ee3a0f
Look and feel v12
2020-04-13 17:55:25 +02:00
Frédéric FRANCE
5933d2282c
Update api_thirdparties.class.php
2020-04-13 09:39:31 +02:00
Frédéric FRANCE
1114f0ee3d
Update api_thirdparties.class.php
2020-04-13 09:25:06 +02:00
Frédéric FRANCE
8c8afa4b46
Update api_thirdparties.class.php
2020-04-13 09:15:01 +02:00
Laurent Destailleur
596ba8d679
Clean deprecated code.
2020-04-13 01:10:35 +02:00
Laurent Destailleur
52b467d2fc
FIX #13550 Removed not used table
2020-04-12 19:06:44 +02:00
Laurent Destailleur
313df360b2
Merge pull request #13566 from atm-maxime/new_user_bank_mgmt
...
New display of user bank account : same way as on thirdparty
2020-04-12 17:22:01 +02:00
Laurent Destailleur
7d430c08d0
Look and feel v12
2020-04-12 16:36:25 +02:00
Laurent Destailleur
d7784887d1
More font awesome picto
2020-04-12 14:58:50 +02:00
Maxime Kohlhaas
d842a436ae
New display of user bank account : same way as on thirdparty
2020-04-11 17:06:50 +02:00
Scrutinizer Auto-Fixer
444c293c01
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-04-10 08:59:32 +00:00
Laurent Destailleur
4ff503d20a
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/stock/list.php
htdocs/supplier_proposal/list.php
2020-04-10 02:07:51 +02:00
Laurent Destailleur
92cd0372db
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/societe/class/societe.class.php
2020-04-10 02:04:26 +02:00
Laurent Destailleur
a1e714f123
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/societe/class/societe.class.php
2020-04-10 02:03:12 +02:00
Laurent Destailleur
c4d898e155
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/societe/class/societe.class.php
2020-04-10 02:01:31 +02:00
Laurent Destailleur
7fe8c7eab3
FIX #11855
2020-04-10 01:37:04 +02:00
Anthony Berton
b1ad30cbb4
Update list.php
2020-04-08 14:51:28 +02:00
Laurent Destailleur
5afd043ec5
Update list.php
2020-04-08 14:50:41 +02:00
Anthony Berton
97e9913f86
Update list.php
2020-04-07 16:24:38 +02:00
Regis Houssin
34e434a17e
FIX missing member entity
2020-04-06 16:36:11 +02:00
Laurent Destailleur
a89b873bd1
Look and feel v12
2020-04-04 19:30:16 +02:00
Laurent Destailleur
d2de6a22eb
WIP Can set values in extra languages
2020-04-01 18:11:28 +02:00
Laurent Destailleur
33d2b61c19
Work on extralanguages
2020-04-01 16:21:03 +02:00
Laurent Destailleur
4ed4644c08
Work on generic multilanguage properties
2020-03-29 04:28:23 +02:00
Laurent Destailleur
ec83f18944
Move more icon definition into CSS
2020-03-28 13:38:25 +01:00
Laurent Destailleur
c27592bad2
Clean deprecated params on all fetch_optionals()
2020-03-27 16:02:58 +01:00
Laurent Destailleur
fa3bba942f
Start to save the VAT src code into table of discounts to reuse them
...
later
2020-03-26 02:01:30 +01:00
Alexandre SPANGARO
5528e9ef38
Work on split module fournisseur
2020-03-24 22:02:58 +01:00
Laurent Destailleur
a5379c7144
FIX All forms must use newToken()
...
Conflicts:
htdocs/commande/card.php
htdocs/compta/cashcontrol/cashcontrol_card.php
htdocs/supplier_proposal/card.php
2020-03-24 13:14:23 +01:00
Laurent Destailleur
1ff15e1fd9
FIX All forms must use newToken()
2020-03-24 13:10:35 +01:00
Scrutinizer Auto-Fixer
e8083e2a65
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-03-23 14:54:02 +00:00
Laurent Destailleur
d965aad6e6
Some fix to support correctly parallel sales
2020-03-23 14:31:59 +01:00
Laurent Destailleur
4b3d2bfb64
Merge pull request #13398 from andreubisquerra/master
...
NEW: Multiple sales in TakePOS
2020-03-22 20:19:40 +01:00
Laurent Destailleur
6f3cbe69e8
Fix phpcs
2020-03-22 19:40:58 +01:00
Laurent Destailleur
700e384639
WIP Edit fields into alternate language
2020-03-22 19:11:21 +01:00
jove@bisquerra.com
a2b973f9f7
NEW: Multiple sales in TakePOS
2020-03-22 14:50:09 +01:00
atm-lena
2e1554def4
FIX : wrong include - replace extrafields_create.tpl.php to extrafields_add.tpl.php
2020-03-18 10:18:52 +01:00
Laurent Destailleur
5f255a6c14
A new way to navigate between pages in list is available
2020-03-17 03:24:24 +01:00
Laurent Destailleur
c66f9476a8
Show owner of card in list
2020-03-16 15:49:58 +01:00
Laurent Destailleur
41ae8f6f68
TakePOS: Move all information of customer in the header
2020-03-16 13:27:10 +01:00
Laurent Destailleur
36873f2db7
Fix bad include
2020-03-13 17:22:54 +01:00
Laurent Destailleur
33c5db9cc3
Prepare code for the new pagination possibility
2020-03-13 13:07:11 +01:00
Laurent Destailleur
52290b002a
NEW Another way to navigate between pages for some lists
2020-03-13 12:53:22 +01:00
Scrutinizer Auto-Fixer
f413ce6aac
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-03-12 11:45:44 +00:00
Laurent Destailleur
1f5c8f682c
FIX cols parameter not propagated to tpl
2020-03-10 21:55:29 +01:00
Laurent Destailleur
d956222e36
FIX cols parameter not propagated to tpl
2020-03-10 21:54:50 +01:00
Laurent Destailleur
054ffb7547
Depreciate variables not used by Dolibarr.
2020-03-06 14:38:06 +01:00
Laurent Destailleur
d0f22c7bff
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/boxes/box_graph_product_distribution.php
2020-03-06 14:22:42 +01:00
Laurent Destailleur
d4b67a6cef
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/contrat/list.php
htdocs/core/lib/functions.lib.php
2020-03-06 14:19:30 +01:00
Laurent Destailleur
aaf9aef5c8
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/contrat/list.php
2020-03-06 14:17:21 +01:00
ATM-Nicolas
a9d7bbc2ed
FIX : Remove unexisting link
2020-03-06 09:52:19 +01:00
Laurent Destailleur
0bd2740779
NEW Can force position of legend of graph on right (instead of top)
2020-03-05 17:23:19 +01:00
Laurent Destailleur
ddb26d7a8f
NEW Add graph type 'piesemicircle'
2020-03-05 16:30:55 +01:00
Laurent Destailleur
fc31680bd0
Several fix for chart.js graphs
2020-03-05 02:55:06 +01:00
Laurent Destailleur
457d0668c8
Look and feel v12
2020-02-24 05:23:34 +01:00
Scrutinizer Auto-Fixer
e44865d8b5
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-02-21 16:53:37 +00:00
Laurent Destailleur
2c477c7169
Fix doxygen
2020-02-20 13:54:41 +01:00
Laurent Destailleur
44eda2d4ad
Fix doxygen
2020-02-20 13:42:43 +01:00
Laurent Destailleur
895503d2eb
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/index.php
htdocs/core/class/CMailFile.class.php
2020-02-20 00:21:25 +01:00
Laurent Destailleur
2cfca2a45e
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/comm/action/card.php
htdocs/comm/index.php
htdocs/core/boxes/box_fournisseurs.php
htdocs/core/boxes/box_propales.php
htdocs/societe/index.php
2020-02-20 00:18:58 +01:00
stickler-ci
c6b05040a3
Fixing style errors.
2020-02-18 17:36:00 +00:00
Pierre Ardoin
afadf9dc0e
Fix Not Display Photo with Multicompany
2020-02-18 18:34:15 +01:00
Pierre Ardoin
ef64e20367
Fix not display value
2020-02-17 19:34:09 +01:00
Laurent Destailleur
f4f3efec62
Fight against $_POST
2020-02-16 19:33:58 +01:00
Laurent Destailleur
9e165a782f
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-02-13 11:58:23 +01:00
Laurent Destailleur
1973f2c9b9
Fix look and feel v11
2020-02-13 10:07:34 +01:00
Laurent Destailleur
7931734ecb
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/modUser.class.php
2020-02-12 20:30:20 +01:00
Thomas
9b0b5f755b
Fixed missing trigger on contact delete
2020-02-12 18:24:37 +01:00
Laurent Destailleur
74d3912763
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fourn/class/fournisseur.facture.class.php
2020-02-11 16:52:58 +01:00
Laurent Destailleur
9f5f460ae2
Fix field def
2020-02-11 16:42:48 +01:00
Laurent Destailleur
918e570e7a
FIX Picture of contact not visible in tooltip
2020-02-10 12:56:08 +01:00
Laurent Destailleur
3a74c3d7e9
Enhance property ->ismulticompanymanaged to define an object with entity
...
on its parent.
2020-02-08 14:40:30 +01:00
Laurent Destailleur
5f75ae4830
FIX If we can change vendor status, we must be able to chane vendor code
2020-02-08 11:34:57 +01:00
Laurent Destailleur
56079f928f
Label of field
2020-02-08 11:34:25 +01:00
Laurent Destailleur
cffc56b80b
Declaration of property fields of thirdparties
2020-02-08 11:32:38 +01:00
Laurent Destailleur
02a96e163f
FIX If we can change vendor status, we must be able to chane vendor code
2020-02-08 11:26:16 +01:00
Laurent Destailleur
1875b6a49b
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/company.lib.php
htdocs/core/lib/security2.lib.php
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
htdocs/core/modules/facture/doc/pdf_sponge.modules.php
htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
htdocs/core/modules/propale/doc/pdf_cyan.modules.php
htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
htdocs/core/modules/supplier_order/pdf/pdf_cornas.modules.php
htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
2020-02-05 14:53:47 +01:00
Laurent Destailleur
5a81e3e181
Merge pull request #13012 from ptibogxiv/patch-299
...
fix url field in edit mode societe/card.php
2020-02-05 14:09:04 +01:00
Alexandre SPANGARO
d6d3fff9dc
Merge branch 'develop' into 10.0_intracommreport
2020-02-03 21:15:07 +01:00
Laurent Destailleur
36461afea9
FIX Creation of Stripe card from backoffice must return a clean message
2020-02-03 14:55:02 +01:00
Laurent Destailleur
7b661e707e
FIX Creation of Stripe card from backoffice must return a clean message
2020-02-03 14:54:35 +01:00
ptibogxiv
eb5ac0d9a9
fix url field in edit mode societe/card.php
2020-02-03 14:28:57 +01:00
Laurent Destailleur
f752551914
WIP Generic stats page
2020-01-31 14:53:47 +01:00
Scrutinizer Auto-Fixer
5fda829023
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-01-30 00:48:28 +00:00
Laurent Destailleur
c103ff58cf
FIX update of llx_societe_account for stripe customer key.
2020-01-27 12:41:22 +01:00
Laurent Destailleur
7b65cdb75a
FIX update of llx_societe_account for stripe customer key.
2020-01-27 12:40:20 +01:00
Laurent Destailleur
df478dc170
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-27 01:53:49 +01:00
Laurent Destailleur
7438f92912
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/compta/prelevement/create.php
htdocs/compta/prelevement/demandes.php
htdocs/compta/tva/document.php
htdocs/fourn/ajax/getSupplierPrices.php
htdocs/societe/card.php
2020-01-27 01:50:02 +01:00
atm-greg
f5395fa859
fix lost name_alias on country selection
2020-01-24 14:28:08 +01:00
Laurent Destailleur
27a0858050
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/stock/class/mouvementstock.class.php
2020-01-23 17:41:31 +01:00
Laurent Destailleur
040f8bef5a
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/societe/class/societe.class.php
2020-01-22 16:29:04 +01:00
Laurent Destailleur
381f2d5eee
Fix typo
2020-01-22 16:24:16 +01:00
Laurent Destailleur
7964699674
FIX Check on unicity on prof id was not triggered sometimes
2020-01-22 16:22:53 +01:00
Laurent Destailleur
88d01fbb22
Save also customer account onn card level.
2020-01-22 16:02:28 +01:00
Laurent Destailleur
24d439845b
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/stock/class/mouvementstock.class.php
2020-01-18 20:20:25 +01:00
Juanjo Menent
057a40dcb2
FIX: In third parties creation, when changing the country drop down, the states are not recharged
2020-01-17 17:05:29 +01:00
Laurent Destailleur
3f79c00542
Merge branch 'develop' into actioncomm_category
2020-01-15 14:21:06 +01:00
Laurent Destailleur
5772dce460
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/functions.lib.php
2020-01-15 12:09:21 +01:00
Laurent Destailleur
b6ed6df75d
Remove property tha has no sense in output #12803
2020-01-13 14:14:51 +01:00
Laurent Destailleur
ed2c75a2f8
Merge pull request #12776 from aspangaro/12.0_a4
...
NEW Add social networks of the company
2020-01-13 13:38:16 +01:00
Laurent Destailleur
b47db086cb
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/inventory/class/inventory.class.php
htdocs/product/inventory/list.php
2020-01-10 14:30:42 +01:00
Laurent Destailleur
d97a59ac4a
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
ChangeLog
htdocs/comm/remise.php
htdocs/core/class/html.form.class.php
htdocs/filefunc.inc.php
htdocs/product/list.php
htdocs/variants/combinations.php
2020-01-10 14:25:26 +01:00
ptibogxiv
5a1f123994
Update societe.class.php
2020-01-07 13:10:10 +01:00
Laurent Destailleur
b9e0f8999f
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2020-01-04 14:03:21 +01:00
Laurent Destailleur
d95e37aa72
Look and feel v11
2020-01-02 20:43:16 +01:00
Laurent Destailleur
298f6d0683
Look and feel v11
2020-01-02 20:36:35 +01:00
Laurent Destailleur
5cb8cceb82
FIX Do not update timestamp when we set the "default" to another record
2020-01-02 20:29:19 +01:00
Laurent Destailleur
dbb65d864e
fix missing column
2020-01-02 19:05:03 +01:00
Laurent Destailleur
b7bf12819a
Add label in list of Stripe payments
2020-01-02 17:19:42 +01:00
Laurent Destailleur
52767c4324
NEW Can enter and edit stripe credit card using the Stripe card ID
2020-01-02 15:45:25 +01:00
Laurent Destailleur
fff805e7ec
Look and feel v11
2020-01-02 15:10:46 +01:00
Frédéric FRANCE
90235d0528
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-12-31 13:57:40 +01:00
Alexandre SPANGARO
c664a1e42d
Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport
2019-12-31 08:34:37 +01:00
Alexandre SPANGARO
9879a43cf4
NEW Add social networks of the company
2019-12-30 21:17:41 +01:00
Laurent Destailleur
4333cf2040
Show the stripe accoutn of a cu_ and a card_
2019-12-24 12:53:10 +01:00
Laurent Destailleur
bceba83f0c
Fix position of fields
2019-12-20 10:42:05 +01:00
Laurent Destailleur
f44b85f557
Fix $_SESSION['newtoken'] must be newToken()
2019-12-18 23:12:31 +01:00
Laurent Destailleur
db5672ae90
Fix creation/update of expense reports
...
Fix export of accounting documents
2019-12-18 23:07:26 +01:00
Scrutinizer Auto-Fixer
455178ff73
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-12-18 14:20:36 +00:00
Scrutinizer Auto-Fixer
404ae0c209
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-12-17 02:00:52 +00:00
Laurent Destailleur
95fc14475c
Fix show correct stripe publishable_key on payment mode page
2019-12-15 17:32:45 +01:00
Laurent Destailleur
cb71d5a7bb
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-12-15 17:18:21 +01:00
Laurent Destailleur
0ef3de98c6
Try to fix conflict of several stripe accounts
2019-12-15 17:18:09 +01:00
Laurent Destailleur
838633d0de
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/system/filecheck.php
htdocs/api/class/api_setup.class.php
htdocs/compta/facture/card.php
htdocs/compta/stats/index.php
htdocs/core/actions_massactions.inc.php
htdocs/install/upgrade2.php
htdocs/loan/card.php
htdocs/loan/document.php
htdocs/loan/info.php
htdocs/loan/note.php
htdocs/loan/schedule.php
htdocs/product/list.php
htdocs/ticket/card.php
htdocs/user/class/user.class.php
2019-12-14 14:53:49 +01:00
Frédéric FRANCE
57055bad03
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-12-13 14:36:00 +01:00
stickler-ci
380b698c6f
Fixing style errors.
2019-12-12 16:09:23 +00:00
Anthony Berton
43f150dc42
Update societe.class.php
2019-12-12 17:02:59 +01:00
Laurent Destailleur
0bb5df42e1
Merge pull request #12650 from frederic34/patch-15
...
The property datem does not exist on Societe
2019-12-09 13:04:31 +01:00
Laurent Destailleur
816f2075fb
Merge pull request #12651 from frederic34/patch-17
...
The variable $db seems to be never defined
2019-12-09 13:03:11 +01:00
Frédéric FRANCE
48564ea760
doxygen societe class
2019-12-08 14:26:59 +01:00
Frédéric FRANCE
f0af450494
The variable $db seems to be never defined
...
The variable $db seems to be never defined on line 154
2019-12-08 13:40:55 +01:00
Frédéric FRANCE
ab33bb1d3b
The property datem does not exist on Societe
2019-12-08 13:37:50 +01:00
Laurent Destailleur
02e2b72190
Use , as separator instead of / for type of third party. This reduce
...
space used.
2019-12-06 10:46:14 +01:00
Frédéric FRANCE
d9bfa62367
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-12-05 21:47:42 +01:00
Florian Mortgat
3f6715a377
FIX: add URL param "restore_last_search_values=1" to all backlinks that point to a list
2019-12-05 15:34:41 +01:00
Frédéric FRANCE
4c5c6b6ff1
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-12-03 17:56:43 +01:00
Laurent Destailleur
2c86aab9ca
Fix responsive
2019-12-03 15:22:46 +01:00
Scrutinizer Auto-Fixer
36a74cd160
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-12-03 10:17:29 +00:00
Laurent Destailleur
92070fa491
Fix name of variable $trigger_name into $triggersendname
2019-12-02 09:38:16 +01:00
Frédéric FRANCE
25ed2b930f
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-12-01 16:10:37 +01:00
Laurent Destailleur
6388370edc
Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop
2019-12-01 10:51:16 +01:00
Laurent Destailleur
790fdc881c
# WARNING: head commit changed in the meantime
...
Restore file for travis
2019-12-01 10:50:56 +01:00
Laurent Destailleur
6bf3af5d83
Merge branch '9.0' of https://github.com/dolibarr/dolibarr into 10.0
...
Conflicts:
htdocs/compta/tva/index.php
htdocs/core/lib/pdf.lib.php
htdocs/core/menus/standard/eldy.lib.php
htdocs/core/tpl/objectline_view.tpl.php
htdocs/margin/productMargins.php
htdocs/margin/tabs/productMargins.php
2019-12-01 10:30:22 +01:00
Laurent Destailleur
1d564c2a39
Merge branch '8.0' of https://github.com/dolibarr/dolibarr into 9.0
...
Conflicts:
htdocs/core/class/notify.class.php
2019-12-01 00:58:01 +01:00
Laurent Destailleur
f549c4fc9c
Merge pull request #12544 from frederic34/select_produits
...
Form select_produits returns void
2019-12-01 00:47:02 +01:00
Maxime Kohlhaas
916954b301
Fix #12371 : access rights on contacts
2019-11-30 14:48:05 +01:00
Maxime Kohlhaas
e0487ea861
Fix #12483 : fix thirdparty numbering module selection
2019-11-30 01:37:15 +01:00
Frédéric FRANCE
c214dd0675
Form select_produits returns void
2019-11-28 21:23:53 +01:00
Frédéric FRANCE
4c4ae5b6e1
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-11-26 08:10:40 +01:00
Laurent Destailleur
70882a749a
Fix responsive for md theme
2019-11-20 14:40:52 +01:00
Frédéric FRANCE
2e5f539b2a
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-11-18 17:45:52 +01:00
Scrutinizer Auto-Fixer
1648fc142e
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-16 22:24:29 +00:00
Laurent Destailleur
2689f7515c
Fix pb with colspan and extrafields.
...
Fix remove empty id
2019-11-16 14:38:05 +01:00
Frédéric FRANCE
6784ea9fae
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-11-16 09:21:57 +01:00
Frédéric FRANCE
fc55123af0
Update api_thirdparties.class.php
2019-11-14 18:31:09 +01:00
Scrutinizer Auto-Fixer
ddcc14dc16
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-14 11:09:15 +00:00
Frédéric FRANCE
a3e092b227
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-11-14 09:21:26 +01:00
Laurent Destailleur
171b94fc5c
Merge pull request #12429 from Dolibarr/scrutinizer-patch-5
...
Scrutinizer Auto-Fixes
2019-11-14 08:50:24 +01:00
Laurent Destailleur
86094613e8
Merge pull request #12428 from Dolibarr/scrutinizer-patch-4
...
Scrutinizer Auto-Fixes
2019-11-14 08:50:06 +01:00
Frédéric FRANCE
446c66da62
use class CONST
2019-11-14 08:15:39 +01:00
Scrutinizer Auto-Fixer
b40ecc3933
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-13 18:37:08 +00:00
Scrutinizer Auto-Fixer
ac40dd8bbe
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-13 18:35:39 +00:00
Scrutinizer Auto-Fixer
8a527631a0
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-13 18:35:02 +00:00
Laurent Destailleur
16c50c212c
Update paymentmodes.php
2019-11-13 19:16:10 +01:00
stickler-ci
366dfc0e5c
Fixing style errors.
2019-11-13 18:15:19 +00:00
Laurent Destailleur
88d2658625
Merge branch 'develop' into scrutinizer-patch-2
2019-11-13 19:14:50 +01:00
Laurent Destailleur
19fba02fb3
Merge pull request #12410 from andreubisquerra/develop
...
Check if draft exists in TakePOS customer list
2019-11-13 18:49:03 +01:00
Laurent Destailleur
a14042e4b2
Update list.php
2019-11-13 18:48:39 +01:00
Laurent Destailleur
cc70ffd1b3
Update list.php
2019-11-13 18:47:35 +01:00
Scrutinizer Auto-Fixer
87585c0f2a
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-13 17:32:11 +00:00
ptibogxiv
24bac213aa
Update paymentmodes.php
2019-11-12 18:39:39 +01:00
ptibogxiv
e33d969178
Fix php error on stripe account display
...
convert non object in full array in order to avoid php error message.
2019-11-12 18:38:23 +01:00
andreubisquerra
34b8325079
Update list.php
2019-11-12 14:21:49 +01:00
andreubisquerra
4f3d4950e1
Check if draft exists in TakePOS customer list
...
Check if draft invoice already exists, if not create it
2019-11-12 13:01:16 +01:00
Laurent Destailleur
c02cd80b75
Clean code
2019-11-12 10:11:30 +01:00
Scrutinizer Auto-Fixer
c85e54b08c
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-12 08:46:08 +00:00
stickler-ci
b892ed05ba
Fixing style errors.
2019-11-10 11:17:19 +00:00
Philippe GRAND
d907f36bb6
add some comment
2019-11-10 12:16:51 +01:00
Laurent Destailleur
2fa82d1bfb
Fix sql error
2019-11-08 13:46:49 +01:00
Laurent Destailleur
83090629fe
Fix join into left join
2019-11-08 13:43:26 +01:00
Laurent Destailleur
4433cff49d
Merge pull request #12346 from frederic34/centpercent
...
100% centpercent
2019-11-07 10:39:09 +01:00
Laurent Destailleur
e885345ef7
FIX Check on duplicate profid was not triggered.
2019-11-06 00:27:36 +01:00
Frédéric FRANCE
35751a80ab
100% centpercent
2019-11-05 21:24:41 +01:00
Laurent Destailleur
94bd0f71d9
Fix pb with permission
2019-11-05 19:41:30 +01:00
Laurent Destailleur
ce1dec253f
FIX #11364
2019-11-05 12:47:38 +01:00
Laurent Destailleur
1aef1c60dd
Merge pull request #11867 from frederic34/socialnetworks
...
NEW add socialnetworks dictionary
2019-11-04 21:10:22 +01:00
Laurent Destailleur
11500fb8d9
FIX confusion between permto... and permisstionto...
2019-11-04 15:33:49 +01:00
Frédéric FRANCE
872f58f261
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-11-03 21:48:24 +01:00
Laurent Destailleur
6f82c212a0
Finished migration to the new architecture of extrafields
2019-11-02 17:38:19 +01:00
Laurent Destailleur
c03fabb789
Clean var
2019-11-02 14:26:27 +01:00
Laurent Destailleur
c9a620d1a6
Renamed property of thirdparty "statut_commercial" into
...
"status_prospect_label"
2019-11-02 14:25:52 +01:00
Laurent Destailleur
1cc9954f61
Clean api from bad vars
2019-11-02 14:20:43 +01:00
Laurent Destailleur
e087ac434d
Merge pull request #12283 from frederic34/socid
...
replace deprecated user->societe_id by user->socid
2019-11-02 13:34:21 +01:00
Laurent Destailleur
58ffb73627
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-11-02 12:59:49 +01:00
Laurent Destailleur
45c77b4560
Renaming some libelle into label
2019-11-02 12:59:38 +01:00
Laurent Destailleur
25e64b0610
Merge branch 'develop' into socid
2019-11-02 12:01:06 +01:00
Laurent Destailleur
68691ddd8a
Merge pull request #12265 from grandoc/new_branch_30_10_2019
...
add comment
2019-11-02 11:49:28 +01:00
stickler-ci
dc97a54d82
Fixing style errors.
2019-11-02 09:39:05 +00:00
Philippe GRAND
3ff5389c4e
add some comment
2019-11-02 10:35:43 +01:00
Scrutinizer Auto-Fixer
50f55cac35
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-02 00:17:45 +00:00
Frédéric FRANCE
dbed10a701
Merge remote-tracking branch 'upstream/develop' into socid
2019-11-01 21:39:20 +01:00
Laurent Destailleur
e3b5be7475
All properties 'libstatut', 'labelstatut', 'labelstatus' were renamed
...
into 'labelStatus'.
All properties 'labelstatusshort' and 'labelstatut_short' were renamed
into 'labelStatusShort'.
2019-11-01 12:52:03 +01:00
Laurent Destailleur
01ac313a87
Fix phpcs
2019-10-31 23:52:05 +01:00
Laurent Destailleur
6a39ecc3c0
Fix phpcs
2019-10-31 23:33:11 +01:00
Laurent Destailleur
68a4ddceed
Look and feel v11
2019-10-31 23:29:17 +01:00
Laurent Destailleur
c9fc17efae
Fix phpcs
2019-10-31 23:06:34 +01:00
Laurent Destailleur
af09c77a0c
Fix phpcs
2019-10-31 22:15:18 +01:00
Laurent Destailleur
c215d534fc
Fix phpcs
2019-10-31 21:16:41 +01:00
Frédéric FRANCE
e93aaa2a75
replace deprecated user->societe_id by user->socid
2019-10-31 20:46:31 +01:00
Frédéric FRANCE
f7747ed00a
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-30 20:06:43 +01:00
Philippe GRAND
502d08af0c
add some comment
2019-10-30 10:10:22 +01:00
Laurent Destailleur
8f5b0f5d4d
Merge pull request #12207 from altatof/sortcontact
...
Sort contacts by lastname, firstname instead of nothing
2019-10-30 03:27:42 +01:00
Laurent Destailleur
0e667776e9
Merge pull request #12225 from ptibogxiv/patch-270
...
NEW Get thirdparty's salesrepresentatives by API
2019-10-30 03:12:20 +01:00
Laurent Destailleur
488edec3a8
Merge pull request #12226 from ptibogxiv/patch-271
...
NEW add office phone & job on user tooltips
2019-10-30 03:11:28 +01:00
Frédéric FRANCE
8f6d38ee82
clean indent
2019-10-27 17:01:23 +01:00
ptibogxiv
b96cbec2b5
Update linesalesrepresentative.tpl.php
2019-10-26 15:00:42 +02:00
ptibogxiv
bb89a16c1a
Update societe.class.php
2019-10-26 14:59:43 +02:00
ptibogxiv
63cc942298
Update linesalesrepresentative.tpl.php
2019-10-25 17:20:42 +02:00
stickler-ci
20b518d527
Fixing style errors.
2019-10-25 15:15:58 +00:00
ptibogxiv
a79283c490
NEW add office phone for salespresentatives
...
for complete https://github.com/Dolibarr/dolibarr/pull/12225
2019-10-25 17:15:34 +02:00
ptibogxiv
b449d5f7e6
NEW Get thirdparty's salesrepresentatives by API
2019-10-25 17:14:00 +02:00
Frédéric FRANCE
a43e6f96b5
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-25 08:12:54 +02:00
Laurent Destailleur
6855f588b5
Use dolGetStatus
2019-10-24 16:38:06 +02:00
altairis
0481e0b0d1
sort contact list on lastname
2019-10-23 17:31:26 +02:00
Laurent Destailleur
b88968520b
Move code of extrafields to the new architecture
2019-10-22 17:08:37 +02:00
Laurent Destailleur
22a14e7bf7
Fix closig tag
2019-10-22 15:40:29 +02:00
Laurent Destailleur
9be9f912af
Merge pull request #12192 from Ahuahuachi/develop
...
Translate documentation and minor code improvement
2019-10-22 12:32:40 +02:00
Laurent Destailleur
e261d63295
NEW Can add a button "Create" after combo of object with modulebuilder.
2019-10-21 14:44:39 +02:00
Alfredo Altamirano
0c5fbdf29d
Translate french documentation
2019-10-20 19:18:39 -05:00
Frédéric FRANCE
86f22c4563
do not ignore lines with mix od tabs and spaces
2019-10-20 17:17:22 +02:00
Frédéric FRANCE
9ec7836387
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-20 16:37:18 +02:00
Cédric
29bad6c7e8
Replace $sortfield by $email in annotation
2019-10-19 16:55:12 +02:00
c3do
ae3ce37a57
copyright mentions
2019-10-19 16:45:30 +02:00
c3do
bb70db82c2
Can get thirdparty by email through API Rest
2019-10-19 16:43:10 +02:00
Frédéric FRANCE
f4540dddb8
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-17 20:24:04 +02:00
Laurent Destailleur
f85899742b
Merge pull request #12153 from frederic34/Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
...
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
2019-10-17 17:48:42 +02:00
Laurent Destailleur
5a5f4c3d72
Look and feel v11
2019-10-17 16:59:26 +02:00
Frédéric FRANCE
e75f7d448c
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
2019-10-16 20:00:01 +02:00
Laurent Destailleur
b60ddc255c
Removed useless html tags
2019-10-16 14:17:53 +02:00
Laurent Destailleur
363000f5b9
Merge pull request #12140 from ptibogxiv/patch-268
...
NEW mode for list thirdparty API (add easy filter for supplier only)
2019-10-16 13:25:05 +02:00
Laurent Destailleur
e1521b6c7d
Fix phpcs
2019-10-16 12:31:44 +02:00
Laurent Destailleur
517fcf45d1
Look and feel v11
2019-10-16 11:23:06 +02:00
Laurent Destailleur
e07e01580d
Replace deprecated code with new one
2019-10-16 03:34:32 +02:00
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
Laurent Destailleur
516d943d1b
Merge pull request #12120 from iouston/patch-6
...
Update document.php
2019-10-14 21:18:33 +02:00
Laurent Destailleur
3866ac6036
Update document.php
2019-10-14 21:18:22 +02:00
iouston
6ebdce8a9d
Update document.php
...
add 2 hidden options for set a default field and a default order on document page
2019-10-14 15:13:07 +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
2d3a6d2108
Update card.php
2019-10-13 06:05:21 +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
f253315c8d
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-08 18:30:58 +02:00
Laurent Destailleur
3acf7211c3
Merge pull request #11847 from ptibogxiv/patch-257
...
NEW: Option to allow to create members from third-party
2019-10-08 15:08:34 +02:00
Laurent Destailleur
43a70e5548
Clean code to use the new $extrafields->attributes array
2019-10-08 09:28:50 +02:00
Frédéric FRANCE
b78187c1eb
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-08 00:07:27 +02:00
Laurent Destailleur
eba3d96293
Update card.php
...
NEW Add option MEMBER_CAN_CONVERT_CUSTOMERS_TO_MEMBERS
2019-10-07 20:36:48 +02:00
Laurent Destailleur
297313e7de
CSS
2019-10-07 16:01:36 +02:00
Laurent Destailleur
c2a7ae23bc
Merge pull request #12034 from aspangaro/11_faicon
...
Fix Fa-icon
2019-10-07 13:03:27 +02:00
Frédéric FRANCE
ec8569dd85
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-06 15:56:21 +02:00
Laurent Destailleur
866dcf18fe
Look and feel v11
2019-10-06 15:34:22 +02:00
Laurent Destailleur
2b66282b61
NEW Code for extrafields uses the new array $extrafields->attributes
2019-10-06 14:41:52 +02:00
Frédéric FRANCE
6384e7eb67
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-05 20:02:16 +02:00
Laurent Destailleur
b883a8092a
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/card.php
htdocs/core/lib/functions.lib.php
htdocs/core/lib/product.lib.php
htdocs/core/tpl/extrafields_list_search_input.tpl.php
htdocs/fourn/facture/card.php
htdocs/product/class/html.formproduct.class.php
2019-10-05 19:35:40 +02:00
Laurent Destailleur
68c28ab3c7
FIX Look and feel v10
2019-10-04 12:31:25 +02:00
Alexandre SPANGARO
ddadff5731
Add globe fa-icon
2019-10-03 21:32:55 +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
3afb4355a8
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-02 18:59:18 +02:00
Laurent Destailleur
24570f7165
Look and feel v11. Picto are fontawesome.
2019-10-02 18:14:41 +02:00
Laurent Destailleur
ba7a288abb
Fix colspan and columns of contact of thirdparties
2019-10-01 23:28:13 +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
fec67aade4
Merge remote-tracking branch 'upstream/develop' into zapier
2019-09-30 18:44:34 +02:00
Laurent Destailleur
b28cd1bb57
Merge pull request #11972 from aspangaro/11.0_fa_icon
...
NEW Add fa_icon on load_fiche_titre
2019-09-30 15:26:28 +02:00
Laurent Destailleur
df1a23ed76
Code comment
2019-09-30 13:04:01 +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
1b151da776
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-09-29 11:28:54 +02:00
Frédéric FRANCE
6c8dc75c96
socialnetworks for thirdparties
2019-09-29 11:20:23 +02:00
Laurent Destailleur
6966651d51
Standardize code to use dolSqlDateFilter
2019-09-28 13:22:05 +02:00
Alexandre SPANGARO
288aea190b
Merge remote-tracking branch 'upstream/develop' into 11.0_fa_icon
2019-09-28 06:09:40 +02:00
Alexandre SPANGARO
7f93f046e9
NEW Add fa_icon on load_fiche_titre
2019-09-28 06:02:25 +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
9bf952cae5
Merge pull request #11938 from ptibogxiv/patch-265
...
FIX new display for stripe account
2019-09-27 14:00:55 +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
Frédéric FRANCE
55e340c60b
closedir only if $handle is ressource
2019-09-25 21:47:43 +02:00
Alexandre SPANGARO
02dbc11f98
Move Gnu.org to https
2019-09-23 21:55:30 +02:00
ptibogxiv
d3b5197956
FIX new display for stripe account
...
invert col and row for better display
2019-09-20 13:02:50 +02:00
Frédéric FRANCE
61e358bb9d
Merge remote-tracking branch 'upstream/develop' into zapier
2019-09-18 21:23:26 +02:00
Laurent Destailleur
41a2a25729
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/ligne.php
2019-09-17 12:23:58 +02:00
Frédéric FRANCE
850b9fd52a
Merge remote-tracking branch 'upstream/develop' into zapier
2019-09-17 08:24:31 +02:00
Maxime Kohlhaas
5d4f702920
Remove bas copy / paste
2019-09-15 16:38:03 +02:00
Laurent Destailleur
23860b15ee
Try a fix for #11852
2019-09-15 16:00:01 +02:00
Frédéric FRANCE
ff77d613fb
Merge remote-tracking branch 'upstream/develop' into zapier
2019-09-15 11:24:13 +02:00
Laurent Destailleur
5ba6a90acc
Fix responsive
2019-09-15 10:49:40 +02:00
Frédéric FRANCE
6444c7378f
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-09-14 16:40:23 +02:00
Frédéric FRANCE
c9c7d60fc0
Merge remote-tracking branch 'upstream/develop' into zapier
2019-09-14 16:37:10 +02:00
Laurent Destailleur
76f478dc44
Fix look and feel
2019-09-14 14:25:47 +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
stickler-ci
2e63e7bc27
Fixing style errors.
2019-09-08 18:17:51 +00:00
ptibogxiv
e37875f70a
Update card.php
2019-09-08 20:16:05 +02:00
ptibogxiv
1368236d29
Update card.php
2019-09-08 20:15:05 +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
bd47bd096b
NEW Can defined a position of numbering submodules for thirdparties
2019-09-03 15:58:20 +02:00
Laurent Destailleur
7dc7ec1a6d
Merge pull request #11770 from ptibogxiv/patch-249
...
Fix var $amount
2019-09-03 12:56:28 +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
ddae5315f1
Updat fontawesome to 5.10.2
2019-09-02 16:13:11 +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
Laurent Destailleur
a269082d70
Replace deprecated code with new one
2019-09-02 03:58:00 +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
ptibogxiv
f80e19c126
Fix var $amount
2019-08-27 17:46:05 +02:00
ptibogxiv
9ac1add425
FIX amount or stripe account with currency
2019-08-27 12:46:28 +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
7c5fc9f3f8
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2019-08-26 16:43:33 +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
11dbe80a7b
Merge pull request #11740 from ptibogxiv/patch-240
...
Fix context display with takepos societe/list.php
2019-08-26 16:37:57 +02:00
Laurent Destailleur
7ebd79a45f
Update list.php
2019-08-26 16:02:24 +02:00
ptibogxiv
dbcead47e1
Update list.php
2019-08-24 16:05:21 +02:00
ptibogxiv
7b5c9818f7
Fix context display with takepos societe/list.php
2019-08-24 15:58:33 +02:00
ptibogxiv
0afc55ab51
Update paymentmodes.php
2019-08-23 09:08:39 +02:00
ptibogxiv
55d70004b1
Update paymentmodes.php
2019-08-23 09:00:11 +02:00
ptibogxiv
4536b8618e
Update paymentmodes.php
2019-08-22 22:48:37 +02:00
ptibogxiv
cef4bdab7b
NEW update / delete stripe account for supplier
2019-08-22 22:20:50 +02:00
ptibogxiv
f70180b51b
FIx number of col for IBAN list
2019-08-21 22:23:58 +02:00
ptibogxiv
5613532b80
Fix context in takepos
...
need downgrade in v10 of this PR fo fix hiden context https://github.com/Dolibarr/dolibarr/pull/11629
2019-08-21 13:30:31 +02:00
Laurent Destailleur
7d51a65401
Merge pull request #11629 from andreubisquerra/master
...
Add contextpage hidden input to preserve contexpage in customer search form
2019-08-16 17:50:52 +02:00
Laurent Destailleur
b8406f842d
Merge pull request #10655 from atm-quentin/FIX_credit_note_used_on_list
...
Fix total on list and amount opened on thirdparty card (for supplier)
2019-08-15 21:14:03 +02:00
Laurent Destailleur
317c5576d1
Merge branch 'develop' into patch-214
2019-08-15 19:38:05 +02:00
ptibogxiv
32d1c787fc
Update paymentmodes.php
2019-08-10 09:37:03 +02:00
Laurent Destailleur
8647a20c18
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/langs/en_US/admin.lang
htdocs/product/dynamic_price/class/price_parser.class.php
htdocs/product/stats/facture.php
2019-08-10 01:57:43 +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
ptibogxiv
d0f6d1f175
Update paymentmodes.php
2019-08-06 13:12:10 +02:00
ptibogxiv
944943dcc0
Update paymentmodes.php
2019-08-06 13:10:40 +02:00
ptibogxiv
2585f7232a
Update paymentmodes.php
2019-08-06 13:09:56 +02:00
ptibogxiv
0fafeab764
Update paymentmodes.php
2019-08-06 13:08:34 +02:00
ptibogxiv
de5872db6d
Update paymentmodes.php
2019-08-06 00:12:49 +02:00
ptibogxiv
bb5dd734a9
Balance Stripe connect account for supplier
2019-08-05 23:34:28 +02:00
andreubisquerra
607a0e5da4
Add contextpage hidden input to preserve contexpage in search form
2019-08-04 10:50:46 +02:00
ptibogxiv
4ed1ff5b9b
Fix display only stripe sources for customer
2019-08-03 21:17:12 +02:00
Laurent Destailleur
d7a41c6b72
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/admin.lang
2019-08-01 12:54:27 +02:00
Laurent Destailleur
5eb8f05061
FIX #11584
2019-08-01 12:23:02 +02:00
Laurent Destailleur
dca775985f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-07-30 20:55:41 +02:00
Laurent Destailleur
34f78c555d
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-07-30 20:55:35 +02:00
Laurent Destailleur
a7a2e483c9
Update paymentmodes.php
2019-07-30 16:01:26 +02:00
Laurent Destailleur
db69a07bc4
FIX Option THIRDPARTY_SUGGEST_ALSO_ADDRESS_CREATION
2019-07-30 15:21:26 +02:00
Maxime Kohlhaas
3cc2c91e31
Use date_rum if defined
2019-07-28 22:26:19 +02:00
Maxime Kohlhaas
be6ad7b6a4
New : can define RUM date on third bank account
2019-07-28 17:10:37 +02:00
Laurent Destailleur
bf55733678
NEW Replace the "info" tab on contract with the more complete "agenda"
...
tag.
2019-07-23 02:45:31 +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
d6d1b29257
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-07-21 16:15:32 +02:00
Laurent Destailleur
904e399293
Fix wrong nb of parmaeters
2019-07-20 16:25:57 +02:00
Laurent Destailleur
6015254a77
Fix var not defined
2019-07-20 16:15:01 +02:00
Laurent Destailleur
b6a1c92fc0
Enhance phpstan
2019-07-20 16:08:31 +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
6bc38acb56
Fix assignation
2019-07-20 16:01:28 +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
Laurent Destailleur
6956067d8f
Fix print of print
2019-07-20 15:04:11 +02:00
VESSILLER
b95395909c
FIX Delete a category to a contact in API
2019-07-19 16:11:44 +02:00
Laurent Destailleur
cd1a2d24ee
Removed not used file
2019-07-19 13:07:07 +02:00
Laurent Destailleur
50480bf517
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/opensurvey/index.php
2019-07-18 18:23:24 +02:00
Laurent Destailleur
3cffd70ed3
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/compta/prelevement/create.php
htdocs/core/class/commonobject.class.php
htdocs/expedition/card.php
htdocs/expedition/class/expedition.class.php
htdocs/fourn/commande/dispatch.php
htdocs/fourn/product/list.php
htdocs/opensurvey/index.php
htdocs/ticket/index.php
htdocs/ticket/list.php
2019-07-18 18:09:37 +02:00
John Botella
70ff806fdf
fix fourn code preload
2019-07-16 10:46:58 +02:00
Laurent Destailleur
f826e9631c
FIX #11463
2019-07-16 00:12:22 +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
2fee41f712
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-07-04 12:27:00 +02:00
ptibogxiv
03938e2123
Update paymentmodes.php
2019-07-02 21:56:50 +02:00
ptibogxiv
126479b5a9
Fix paymentmethod detach
2019-07-02 21:46:00 +02:00
Laurent Destailleur
0725ce0e3f
Update consumption.php
2019-06-28 12:37:44 +02:00
ptibogxiv
b2ec60d53b
Fix qty to negative if refund
2019-06-26 14:08:51 +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
6cab4f03ba
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-06-22 12:10:50 +02:00
Laurent Destailleur
ed34d4ccbd
Bad trans
2019-06-22 12:10:30 +02:00
Laurent Destailleur
9e7b08e378
Trans missing
2019-06-22 12:05:17 +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
403d41ec30
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-06-22 11:55:33 +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
a264a4766a
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-06-20 03:45:04 +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
Nicolas ZABOURI
2e4db8c83c
Merge remote-tracking branch 'Dolibarr/10.0' into MissingHook
2019-06-19 08:39:05 +02:00
ICstage
820c420ae5
FIX Missing hooks
2019-06-18 14:07:52 +02:00
Eric Seigne
0b3bc5a172
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into allowZeroAsAccountNumber
2019-06-17 18:30:11 +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
8330078de1
Fix default value
2019-06-17 12:33:09 +02:00
Laurent Destailleur
efb9a30ec1
Fix compatibility with payment modes
2019-06-16 17:17:07 +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
bc8c7e0d4f
Code comment
2019-06-14 15:03:37 +02:00
Laurent Destailleur
21a1e0d7b3
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/categories/index.php
htdocs/comm/action/list.php
htdocs/comm/action/rapport/index.php
htdocs/compta/paiement.php
htdocs/compta/sociales/document.php
htdocs/compta/tva/document.php
htdocs/core/actions_massactions.inc.php
htdocs/core/class/commonobject.class.php
htdocs/fourn/facture/paiement.php
htdocs/loan/document.php
htdocs/main.inc.php
2019-06-04 19:03:27 +02:00
Laurent Destailleur
57cfb4b007
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/core/actions_massactions.inc.php
htdocs/website/class/website.class.php
2019-06-02 12:36:07 +02:00
Maxime Kohlhaas
6dd01e86e9
Fix : avoid warning and uniformize var use
2019-05-31 15:53:23 +02:00
Laurent Destailleur
2218994958
FIX Duplicate encoding on error message
2019-05-29 09:51:45 +02:00
Laurent Destailleur
e90bef1cd8
Fix Clean vat number for vies
2019-05-22 16:41:19 +02:00
Laurent Destailleur
20caf641bf
Fix translation of country
2019-05-22 16:12:29 +02:00
Laurent Destailleur
2b90df6f80
Fix responsive
2019-05-22 16:08:21 +02:00
Laurent Destailleur
0bd47a3f50
Fix responsive
2019-05-22 15:58:44 +02:00
Laurent Destailleur
70aa77ac7e
Remove spaces into VAT validation
2019-05-22 15:54:15 +02:00
Laurent Destailleur
5e690ddd41
Fix avoid subquery into query
2019-05-22 15:41:22 +02:00
Laurent Destailleur
11bcfb4f5e
Fix check on VAT syntax not visible on list
2019-05-22 15:37:59 +02:00
Laurent Destailleur
18f1952e2d
Fix set of properties
2019-05-22 14:49:18 +02:00
Laurent Destailleur
c1a0e9385f
Merge pull request #11219 from frederic34/patch-2
...
dol_print_object_info return void
2019-05-21 22:38:39 +02:00
Laurent Destailleur
22e897b1a1
Clean and prepare code to fix a SQL injection
2019-05-21 17:22:38 +02:00
Laurent Destailleur
e463b17c15
Fix look and feel v10
2019-05-21 15:31:56 +02:00
Laurent Destailleur
eafc35b00f
Look and feel v10
2019-05-21 13:27:45 +02:00
Laurent Destailleur
5f23cf7e2a
CSS
2019-05-19 13:51:47 +02:00
Frédéric FRANCE
7d66cc1ab1
Update agenda.php
2019-05-19 09:14:29 +02:00
Laurent Destailleur
11fea03074
Merge pull request #11026 from atm-john/new_look_and_feel_title_button
...
NEW : look and feel title button
2019-05-18 16:04:47 +02:00
Norbert Penel / OSCSS
5ddf16685f
fix missing traduction on societe
...
a translation key was missing
2019-05-18 00:25:46 +02:00
Laurent Destailleur
ae3a20d6ff
FIX compatibility with intent payment_modes
2019-05-17 00:10:44 +02:00
Laurent Destailleur
b8cb21e452
Merge pull request #11177 from javierybar/master
...
Simplify terminal variables in Takepos
2019-05-16 21:23:15 +02:00
Laurent Destailleur
fd5048ef73
Fix reported by phpstan
2019-05-15 19:16:48 +02:00
Laurent Destailleur
4a69541419
Several bug fixes using phpstan
2019-05-15 18:59:46 +02:00
javierybar
114ddea54f
Simplify terminal variables
2019-05-14 19:58:08 +02:00
John BOTELLA
b0e780fab0
Fix travis
2019-05-13 09:39:45 +02:00
Laurent Destailleur
7d2d12348c
Fix popup
2019-05-10 14:27:48 +02:00
Laurent Destailleur
0e7be8365c
Fix size of box
2019-05-10 14:22:07 +02:00
Laurent Destailleur
590b1d1e90
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php
htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
2019-05-08 18:24:50 +02:00
Alexandre SPANGARO
c86318ea66
fix
2019-05-05 21:49:04 +02:00
Alexandre SPANGARO
99b068b625
FIX sortfield on lettering function
2019-05-05 21:46:56 +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
8e626ad463
Fic xss
2019-04-24 10:51:26 +02:00
Laurent Destailleur
f5fb8363d8
FIX #11041
2019-04-24 10:26:57 +02:00
ATM john
684879d73c
apply appli btn to more elements
2019-04-16 21:49:26 +02:00
ATM john
07e6ce5460
Appli function to links
2019-04-15 21:33:31 +02:00
ATM john
292d9c38a5
Appli function to links
2019-04-15 00:21:58 +02:00
atm-quentin
6deba39c6a
FIX credit note can be split
2019-04-12 10:16:13 +02:00
atm-quentin
7ae6472e36
Merge branch '8.0' of github.com:Dolibarr/dolibarr into FIX_credit_note_used_on_list
2019-04-12 09:20:16 +02:00
ptibogxiv
ab172e30ad
only display stripe customer if customer
2019-04-11 16:11:00 +02:00
Laurent Destailleur
d7f980fda0
NEW Add picto of deletion on mass action combo lists
2019-04-09 01:22:59 +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
ba9cceeee5
Fix phpcs
2019-04-05 19:42:56 +02:00
Laurent Destailleur
fff9b7db9d
Fix doxygen
2019-04-04 18:33:12 +02:00
Laurent Destailleur
21b9836508
FIX default value of language of thirdparty
...
Conflicts:
htdocs/societe/card.php
2019-04-04 11:08:13 +02:00
Laurent Destailleur
3fb97de996
Fix default value of language of thirdparty
2019-04-04 11:05:15 +02:00
Laurent Destailleur
61fad96bcb
Merge pull request #10926 from joseplluis/patch-1
...
FIX filter by name_alias field on fetch
2019-03-31 18:55:58 +02:00
Laurent Destailleur
1b2826f476
Look and feel v10
2019-03-29 13:26:26 +01:00
Laurent Destailleur
eef95a8a78
Fix syntax error
2019-03-28 13:17:51 +01:00
Laurent Destailleur
c888c071e5
Removed duplicate file
2019-03-28 13:10:44 +01:00
Laurent Destailleur
3de82ad345
Prepare removal of duplicate page
2019-03-28 12:27:31 +01: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
Laurent Destailleur
f27f65e8bf
Responsive
2019-03-25 10:09:02 +01:00
Laurent Destailleur
c148157566
Remove duplicate translation keys
2019-03-24 23:29:22 +01:00
markus
f942917f53
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into patch-1
2019-03-24 17:42:49 +01:00
Laurent Destailleur
78ca554240
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-03-21 19:28:20 +01:00
Laurent Destailleur
36f31230b3
FIX url to stripe payment modes card_...
2019-03-21 19:27:56 +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
Philippe GRAND
63b7da3a23
update with html5 compliant code
2019-03-17 10:15:51 +01:00
Laurent Destailleur
dabccb7967
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/class/adherent.class.php
htdocs/fourn/facture/paiement.php
2019-03-16 20:12:53 +01:00
Laurent Destailleur
8adc333823
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-03-16 19:41:50 +01:00
Maxime Kohlhaas
68945c7d51
Fix #10177
2019-03-16 09:11:43 +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
Laurent Destailleur
c72cd7e750
Merge pull request #10807 from altatof/ste
...
change add_commercial function signature
2019-03-15 19:26:12 +01:00
Laurent Destailleur
cdf6e4b65a
Fix some PSR rules
2019-03-14 16:43:27 +01:00
Laurent Destailleur
30c327c702
CSS
2019-03-12 17:19:58 +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
Laurent Destailleur
dd9a4a8cbc
CSS
2019-03-04 12:29:36 +01:00
Laurent Destailleur
4f9981063f
Merge branch 'Squiz.Scope.MethodScope.Missing' of https://github.com/frederic34/dolibarr into frederic34-Squiz.Scope.MethodScope.Missing
2019-03-02 18:26:50 +01:00
Laurent Destailleur
56d921ea52
CSS
2019-03-02 12:57:07 +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
Laurent Destailleur
3fa2680859
Merge pull request #10669 from frederic34/html5fix
...
replace by html5 in ticket supplier_proposal, stripe, societe
2019-02-24 20:36:24 +01:00
Frédéric FRANCE
894123fb06
PSR2.Methods.FunctionCallSignature.SpaceBeforeOpenBracket
2019-02-24 20:06:55 +01:00
Frédéric FRANCE
8b090c165e
replace html code by html5 in societe
2019-02-23 21:18:44 +01:00
Frédéric FRANCE
c1c6103138
replace html code by html5 in societe
2019-02-23 21:02:39 +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
551a195595
Merge pull request #10612 from frederic34/patch-22
...
remove dead code in /societe/contact.php
2019-02-15 15:18:06 +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
Frédéric FRANCE
dd1d7121a8
remove dead code in /societe/contact.php
2019-02-14 20:36:08 +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
Laurent Destailleur
e054b080a5
Merge branch 'develop' into GenericFunctionsFunctionCallArgumentSpacing
2019-02-12 13:33:39 +01:00
Frédéric FRANCE
b041eeae22
first parameter of print_liste_field_titre was translated
2019-02-10 18:11:34 +01:00
klemens
beb2791dde
spelling fixes
2019-02-10 12:59:09 +01:00
Frédéric FRANCE
1e43f8e54a
PEAR FunctionCallSignature
2019-02-10 10:45:49 +01:00
Laurent Destailleur
14a48b2c95
Fix phpcs
2019-02-08 11:17:04 +01:00
Laurent Destailleur
7334f02e5c
Merge pull request #10514 from atm-florian/dev_defautselectcustomertype
...
Dev defautselectcustomertype
2019-02-08 09:56:29 +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
0156cd40a6
Fix name
2019-02-07 14:00:32 +01:00
Laurent Destailleur
065e74379b
Missing picto
2019-02-07 13:54:38 +01:00
Laurent Destailleur
2ef8544a39
sort and filter on parent company
2019-02-07 13:52:51 +01:00
florian HENRY
bc74cd5066
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_defautselectcustomertype
2019-02-07 12:21:45 +01:00
Laurent Destailleur
5516cb061d
Fix filter
2019-02-06 18:50:34 +01:00
Laurent Destailleur
d960159b73
NEW Column of parent company is available in list of third parties
2019-02-06 18:49:58 +01:00
florian HENRY
f0f0b69d87
add comment
2019-02-06 10:59:24 +01:00
florian HENRY
3f6187fe12
remove useless parameters
2019-02-06 10:58:40 +01:00
florian HENRY
813a7a0085
remove comment
2019-02-06 10:57:11 +01:00
florian HENRY
3f20cae6d3
NEW: setup default thridparty type (customer or prospect/customer)
2019-02-06 10:54:11 +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
Laurent Destailleur
a6dde3d6bd
Merge branch 'develop' into nospaceaftercomma
2019-02-03 19:27:16 +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
Frédéric FRANCE
03701fa091
psr2
2019-02-02 18:25:01 +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
77747ac2a3
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
2019-01-28 16:35:12 +01:00
Laurent Destailleur
0827929ede
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/card.php
2019-01-28 16:29:34 +01:00
Laurent Destailleur
1ebd7048fb
Add hook in list of stripe payment mode list
2019-01-28 03:00:28 +01:00
Laurent Destailleur
4398649af6
Add hooks to add column in list of payment modes
2019-01-28 01:46:59 +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
de0a057b8a
Fix div not closed
2019-01-27 19:41:14 +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
Philippe GRAND
73606c85b3
update with html5 compliant code
2019-01-21 10:08:20 +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
Laurent Destailleur
2e55bdf087
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-01-17 19:11:18 +01:00
JC Prieto
5223b1ee1a
FIX: To add more pdf models in thirdparties
2019-01-16 20:23:16 +01:00
atm-quentin
013c078c8b
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_manage_multicompany_for_invoice
2019-01-16 10:52:46 +01:00
Laurent Destailleur
0f2406c202
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-01-15 10:55:28 +01:00
Laurent Destailleur
8c6fde72f8
Several fixes in look and feel of module survey
2019-01-13 19:36:00 +01:00
Laurent Destailleur
8ffe4db853
Merge pull request #10317 from mapiolca/patch-1
...
FIX Multicompany
2019-01-10 14:00:48 +01:00
Laurent Destailleur
5d0ff28556
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/societe/card.php
2019-01-08 01:56:03 +01:00
Laurent Destailleur
d2f6899346
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/accountancy/journal/bankjournal.php
htdocs/admin/defaultvalues.php
htdocs/societe/card.php
2019-01-08 01:53:00 +01:00
Laurent Destailleur
087a4400b0
FIX Default value on sales representative on third party creation
2019-01-08 01:05:42 +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
Josep Lluís
f496945677
FIX search by fax field
...
Search by fax field is looking for another field
2018-12-20 14:02:10 +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
4a4bf3273b
Experiment disabling of creation of contact+thirdparty with hidden
...
option THIRDPARTY_SUGGEST_ALSO_ADDRESS_CREATION
2018-12-16 13:22:38 +01:00
Laurent Destailleur
88a52aa11d
Merge branch 'develop' into develop_mc
2018-12-14 15:58:52 +01:00
Laurent Destailleur
2011afe6fb
Merge branch 'develop' into actionrefused
2018-12-14 15:48:24 +01:00
Laurent Destailleur
611ccc4a9a
Merge branch 'develop' into fieldlabel
2018-12-14 15:42:01 +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
Laurent Destailleur
ef3a280f40
Merge pull request #10082 from grandoc/new_branch_26_11_2018
...
fix typo error
2018-11-29 10:57:48 +01:00
Laurent Destailleur
7c22504252
Fix position of field must be ssame between create/edit/view
2018-11-27 09:22:59 +01:00
Philippe GRAND
8722ccef82
fix typo error
2018-11-26 14:35:29 +01:00
Laurent Destailleur
1d2c2a23ef
Fix look and feel v8
2018-11-25 11:57:19 +01:00
Regis Houssin
7cba680f38
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc
2018-11-18 17:07:03 +01:00
Laurent Destailleur
a2c9fefee0
Fix do not show tool to check european vat if country is not in EEC
2018-11-17 00:40:39 +01:00
atm-quentin
c18f486179
set facture to invoice AND check invoicenumber conf
2018-11-16 11:20:03 +01:00
atm-quentin
a8ab666d62
remplacement en masse des $conf->entity par des getEntity('facture')
2018-11-16 11:17:18 +01:00
Frédéric FRANCE
12dcda7e02
Merge remote-tracking branch 'upstream/develop' into fieldlabel
2018-11-15 22:01:36 +01:00
Regis Houssin
aaa9a4f47c
FIX use getEntity('invoice') instead getEntity('facture')
2018-11-15 17:27:49 +01:00
Frédéric FRANCE
731d19a29b
add tooltip to butActionRefused
2018-11-13 21:40:17 +01:00
Frédéric FRANCE
09efde4901
Merge remote-tracking branch 'upstream/develop' into fieldlabel
2018-11-09 18:13:59 +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
66ffcf287a
Fix filter on extrafields
2018-11-07 12:49:17 +01:00
Laurent Destailleur
c5231112c5
Fix regression with old canvas
2018-11-07 12:22:12 +01:00
Laurent Destailleur
4a25317f10
Fix security on GETPOST('action'). Param must be sanitized.
2018-11-05 20:29:07 +01:00
Laurent Destailleur
c0f4ec5a3e
FIX sanitize param $action
2018-11-05 17:53:31 +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
Frédéric FRANCE
c92a2084f1
remove fieldlabel and add fieldeditkey
2018-10-27 14:50:27 +02:00
Regis Houssin
569d59d251
FIX change my deprecated email
2018-10-27 14:43:12 +02:00
Frédéric FRANCE
9c7ec434b7
remove fieldlabel and add fieldeditkey
2018-10-27 13:48:30 +02:00
Laurent Destailleur
461bd76f70
Fix customer and supplier code name
...
Fix bill time flag must be visible only if option on
2018-10-26 23:27:29 +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
4e82a6da46
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-10-19 14:29:32 +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
6d1a934e8d
Merge pull request #9792 from atm-greg/Disable_customerprospect_thirdparty_type
...
NEW Add configuration to disable "customer/prospect" thirdparty type
2018-10-19 13:47:33 +02:00
Laurent Destailleur
b6e333876e
FIX #9813
2018-10-19 12:56:21 +02:00
atm-greg
d86c44e641
Add conf to disable a thirdparty type
2018-10-17 15:55:46 +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
44d8333633
Fix external link must be after label
2018-10-16 20:00:53 +02:00
Laurent Destailleur
97273ff746
Merge pull request #9768 from ptibogxiv/patch-75
...
Add source link in stripe
2018-10-16 19:50:11 +02:00
Laurent Destailleur
78d7ea459d
Update paymentmodes.php
2018-10-16 19:49:16 +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
ptibogxiv
2cf87db10a
Add source link in stripe
2018-10-16 17:59:58 +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
995e9b4f55
Merge remote-tracking branch 'upstream/develop' into new_branch_10_10_2018
2018-10-12 12:16:57 +02:00
Laurent Destailleur
53b099858f
FIX cutomer or supplier categories visible or not when required
2018-10-12 12:04:04 +02:00
Laurent Destailleur
ded5c4c3dd
Social network module
2018-10-12 11:02:03 +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
Alexey Pyltsyn
49de7a5881
Replace multiple load calls with loadLangs method
2018-10-01 09:22:23 +03: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
e9dd967610
Support nomassaction param on list
2018-09-28 13:12:47 +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
Laurent Destailleur
436deea4c5
Code comment
2018-09-24 10:26:49 +02:00
Laurent Destailleur
ad6895aa2e
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-09-24 10:23:09 +02:00
Ferran Marcet
d6d58b1f68
FIX #9432
2018-09-21 10:18:54 +02:00
Ferran Marcet
1a7b38f22a
FIX #9432
2018-09-21 10:14:23 +02:00
Ferran Marcet
4597cd44e5
FIX #9432
2018-09-20 17:52:44 +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
Laurent Destailleur
d35687c8b3
Work on module social network
2018-09-19 01:45:56 +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
Laurent Destailleur
e9159dda02
Merge pull request #9513 from ptibogxiv/patch-62
...
FIX link in connect mode
2018-09-15 17:28:35 +02:00
Laurent Destailleur
bbfe4462dc
NEW Add lib for multiselect with checkboxes
...
NEW Can select several prospect level in thirdparty filter.
Remove old multiselect lib that was not used by core.
2018-09-15 13:31:25 +02:00
ptibogxiv
362c9fd0b1
FIX link in connect mode
2018-09-14 15:38:38 +02:00
Laurent Destailleur
961505d510
NEW Add filter on staff range in list of thirdparties
2018-09-14 01:29:03 +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
f5074f4962
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-09-12 18:12:17 +02:00
Laurent Destailleur
50478b1bd4
FIX capital must be empty and not 0 if undefined
2018-09-12 15:21:11 +02:00
Laurent Destailleur
5bd2c01411
Fix email missing in tooltip
2018-09-12 14:43:05 +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
Laurent Destailleur
20fa294ff1
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2018-09-10 01:22:16 +02:00
Laurent Destailleur
15aa99fc8e
Fix css
2018-09-10 01:22:01 +02:00
Laurent Destailleur
f9e2fb7a36
Style
2018-09-10 01:16:32 +02:00
Frédéric FRANCE
7e0b1055db
Merge remote-tracking branch 'upstream/develop' into camelCaps2
2018-09-09 13:36:53 +02:00
Laurent Destailleur
6b47b63e61
Code comment
2018-09-09 13:23:41 +02:00
Laurent Destailleur
f0950e4cfb
Add last change date
2018-09-09 13:15:32 +02:00
Laurent Destailleur
0db7f6b8f3
Clean code
2018-09-08 23:00:17 +02:00
Frédéric FRANCE
2b62c4ca8f
Merge remote-tracking branch 'upstream/develop' into camelCaps2
2018-09-08 10:50:27 +02:00
Laurent Destailleur
e2df3fd4ad
Merge pull request #9423 from ptibogxiv/patch-55
...
Fix error when delete stripe customer
2018-09-07 19:34:45 +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
ptibogxiv
da4e902645
Fix error when delete stripe customer
2018-09-06 11:35:19 +02:00
Frédéric FRANCE
4e619dd0ed
Merge remote-tracking branch 'upstream/develop' into camelCaps2
2018-09-05 18:51:21 +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
Laurent Destailleur
aec0d4022b
Fix responsive
2018-09-04 19:59:20 +02:00
Laurent Destailleur
154e44e761
Fix responsive
2018-09-04 19:57:20 +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
Philippe GRAND
7a0c19485e
fix merge
2018-09-03 09:34:08 +02:00
Frédéric FRANCE
2a9ef8dc05
move phpcs:ignore
2018-09-02 22:05:19 +02:00
Frédéric FRANCE
22b9632555
move phpcs:ignore
2018-09-02 21:08:57 +02:00
Frédéric FRANCE
e13a8ec572
Merge remote-tracking branch 'upstream/develop' into camelCaps2
2018-09-02 18:19:45 +02:00
Laurent Destailleur
887a40cf1d
Remove TODO
2018-09-02 16:46:01 +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
Philippe GRAND
a36061079b
Update and standardize code
2018-08-22 11:11:59 +02:00
Frédéric FRANCE
6b6daf178f
Merge remote-tracking branch 'upstream/develop' into camelCaps
2018-08-21 20:57:58 +02:00
Laurent Destailleur
db3c17668e
Fix coding style
2018-08-21 19:08:11 +02:00
Laurent Destailleur
0799970804
Merge pull request #9248 from frederic34/FunctionDeclaration
...
function declaration
2018-08-21 13:41:56 +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
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
3210181a3d
rule for private function is different
2018-08-14 10:21:34 +02:00
Frédéric FRANCE
850ac34020
mark non camelCaps function
2018-08-13 17:26:32 +02:00
Laurent Destailleur
21555a7435
Fix firstname/lastname
2018-08-13 01:10:51 +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
Laurent Destailleur
2d571acc03
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/commande/list.php
2018-08-12 19:25:44 +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
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
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
Laurent Destailleur
8d54df4263
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
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
2018-08-08 17:31:23 +02:00
Juanjo Menent
948bb47040
Merge pull request #9207 from atm-florian/dev_showadressinthirdpartylistoption
...
NEW: Add option to display thirdparty adress in combolist
2018-08-08 11:14:22 +02:00
florian HENRY
847d5bfb92
add config
2018-08-06 10:55:28 +02:00
florian HENRY
45a52a955e
NEW: Add optoin to display thirdparty adress in combolist
2018-08-06 10:52:10 +02:00
Philippe GRAND
4e3898d357
standardize
2018-08-05 17:21:59 +02:00
Philippe GRAND
948647f3f9
comment translation
2018-08-04 14:17:51 +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
Frédéric FRANCE
a0a5d33641
test include
2018-07-26 17:30:53 +02:00
gauthier
c95d6271a9
FIX : missing hook to edit sql
2018-07-25 11:15:13 +02:00
Laurent Destailleur
dc2fec8f57
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-24 19:37:04 +02:00
Laurent Destailleur
f672e8bf02
Fix trans
2018-07-24 19:12:35 +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
gauthier
80ff7fa86f
FIX : case when we valid form with keyboard
2018-07-11 15:18:30 +02:00
gauthier
103c7e6d06
FIX : page must always be 0 when we search (to avoid case : when we're on page 3 and we're looking for a precise thirdparty, we stay on page 3 and nothing's displaied)
2018-07-11 09:51:36 +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
5583600066
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-03 17:37:50 +02:00
Laurent Destailleur
50df452b9e
Fix status "Supplier" not always visible.
2018-07-03 17:37:23 +02:00
Laurent Destailleur
982a1ffbaf
NEW Automatic position of scroll when creating an extrafield
2018-06-30 14:22:05 +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
5c93fa1bfb
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/admin/journals_list.php
htdocs/compta/facture/fiche-rec.php
htdocs/core/class/html.form.class.php
htdocs/filefunc.inc.php
htdocs/langs/fr_FR/other.lang
2018-06-26 01:25:03 +02:00
Laurent Destailleur
36402c22ee
FIX SQL Injections reported by mu shcor (ADLab of Venustech)
2018-06-25 14:06:09 +02:00
Laurent Destailleur
5829014218
Merge branch 'develop' into NEW_advance_targer_filter_everywhere
2018-06-24 10:24:26 +02:00
Laurent Destailleur
eb88f1e5c9
Fix look and feel v8
2018-06-23 12:41:03 +02:00
Laurent Destailleur
06342ff80c
FIX contextpage on contact list
2018-06-23 12:06:17 +02:00
Laurent Destailleur
4dcc74d08f
Fix the "back to list" link also restore the contextpage
2018-06-23 11:55:04 +02:00
Laurent Destailleur
27a27e02a1
Fix css
2018-06-22 22:53:53 +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
Laurent Destailleur
a15cfd23f0
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-06-13 22:57:51 +02:00
Laurent Destailleur
4a5fd35e11
Look and feel v8
2018-06-13 22:57:41 +02:00
Laurent Destailleur
c5887c1ec7
Merge pull request #8399 from ptibogxiv/patch-23
...
FIX lang for support more type of stripeconnect account
2018-06-13 22:13:43 +02:00
Laurent Destailleur
aaa6565014
Merge pull request #8938 from HackLo/develop
...
FIX: Link does not work when there is spaces in SIREN
2018-06-13 21:39:54 +02:00
Laurent Destailleur
916424943e
Merge pull request #8942 from grandoc/new_branch_10_06_2018
...
New branch 10 06 2018
2018-06-13 20:48:22 +02:00
Laurent Destailleur
3ec6b88ece
Merge pull request #8958 from frederic34/listfax
...
FIX add fax to thirdparty list
2018-06-13 20:10:10 +02:00
Frédéric FRANCE
345fb1f2af
add fax to thirdparty list
2018-06-13 17:57:15 +02:00
Philippe GRAND
5021c7a556
clean and update code
2018-06-10 18:29:04 +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
b6955692b4
Fix autofill of password
2018-06-05 11:22:00 +02:00
Laurent Destailleur
7a8fac4198
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/action/list.php
2018-06-04 15:14:26 +02:00
Laurent Destailleur
840330deea
Merge pull request #8905 from atm-greg/Add_supplier_proposals_in_suppliers_linkedObjects
...
Add supplier proposal in linkedObjects type select of the suppliers
2018-06-04 13:46:36 +02:00
Laurent Destailleur
eaee252a5d
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-06-04 12:56:12 +02:00
Laurent Destailleur
29ee5dffc4
Clean code
2018-06-04 12:55:55 +02:00
atm-greg
0785029fe0
Add supplier proposal in linkedObjects type select of the suppliers
2018-05-31 10:46:50 +02:00
areaeuro
475297b98b
Update card.php
...
Line 714 - conditional to delete thirdparty logos
$object->photo
does not exits, and should read
$object->logo
This appears to be an oversight, as it is correct in the rest of the file
2018-05-30 12:29:02 +02:00
Laurent Destailleur
182abfdb5b
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/list.php
htdocs/commande/list.php
htdocs/societe/card.php
2018-05-25 15:02:24 +02:00
Laurent Destailleur
8a64ee2297
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/commande/list.php
htdocs/compta/facture/card.php
htdocs/compta/facture/list.php
htdocs/expedition/class/expedition.class.php
htdocs/expedition/list.php
htdocs/societe/card.php
2018-05-25 13:14:58 +02:00
Laurent Destailleur
fa252d5cbd
Merge branch 'develop' into FIX_6.0_pdf_note_incoterm
2018-05-25 11:59:22 +02:00
Laurent Destailleur
354198b31e
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/societe/contact.php
2018-05-22 20:26:09 +02:00
Laurent Destailleur
2a579b707a
FIX javascript showempty error
...
FIX Contact tab not visible when using canvas
2018-05-22 19:43:28 +02:00
Laurent Destailleur
be21405d21
Fix missing error message
2018-05-22 19:24:56 +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
Laurent Destailleur
4f6b0fead6
Fix filter on test/live mode for stripe card
2018-05-17 15:13:16 +02:00
Laurent Destailleur
200af6ea5c
Fix stripe link
2018-05-17 09:45:31 +02:00
Laurent Destailleur
ac97ba9e36
Fix deletion of stripe card
...
Solve validation of recurring invoice
2018-05-16 20:41:01 +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
Marc de Lima Lucio
b0d05b4824
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_conf_thirdparty_tag
2018-05-03 09:47:25 +02:00
Marc de Lima Lucio
bc7b05537f
NEW: hidden conf to assign category to thirparty neither customer nor prospect nor supplier
2018-05-03 09:26:48 +02:00
Laurent Destailleur
3cad7c6998
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-05-01 12:51:46 +02:00
Laurent Destailleur
e79c907ae0
Fix edit of capital
2018-04-30 11:01:33 +02:00
Laurent Destailleur
461ae46cc4
FIX When on a high page and searching for a small result, list was not
...
visible.
2018-04-24 11:37:57 +02:00
Laurent Destailleur
fcf91b6c8c
Look and feel v8
2018-04-24 11:12:12 +02:00
Laurent Destailleur
ac89951acd
Merge pull request #8647 from fmarcet/develop
...
New: Add same parameters on 'printFieldListTitle' hooks
2018-04-22 19:35:09 +02:00
Laurent Destailleur
69adf73f4f
Clean code from $var = True
2018-04-22 19:27:37 +02:00
Laurent Destailleur
fec9303d18
Remove useless $var
2018-04-22 18:51:03 +02:00
Laurent Destailleur
411949a6bb
Optimize constructors
2018-04-21 15:08:46 +02:00
Laurent Destailleur
ccd9aa8059
Fight against dolibarr warnings
2018-04-21 12:16:12 +02:00
Laurent Destailleur
22c6b596a7
Remove dead code
2018-04-20 15:56:10 +02:00
Laurent Destailleur
d0efc41983
New support of option BANK_ACCOUNT_ALLOW_EXTERNAL_DOWNLOAD
2018-04-20 14:50:11 +02:00
Ferran Marcet
6ced1a3264
New: Add same parameters on 'printFieldListTitle' hooks
2018-04-20 10:38:16 +02:00
Laurent Destailleur
bbfc4a3e17
NEW Look and feel v8 - Show Picto "+" on all links "Add record"
2018-04-18 03:26:15 +02:00
Laurent Destailleur
0d0da234b1
Lowercase NULL, TRUE, FALSE according to PSR2
2018-04-16 13:51:16 +02:00
Laurent Destailleur
8fbde88872
Look and feel v8
2018-04-15 17:37:49 +02:00
Laurent Destailleur
9e50bbb9b1
standardize code
2018-04-15 16:35:18 +02:00
Laurent Destailleur
c6f57b8ec4
Update societe.php
2018-04-13 23:29:47 +02:00
atm-quentin
ba5ac47602
NEW OnSearchAndListGoOnCustomerOrSupplierCard conf
2018-04-13 15:48:58 +02:00
Laurent Destailleur
be965bdbab
Clean code
2018-04-13 13:28:48 +02:00
Laurent Destailleur
1521b0595b
Clean code
2018-04-13 11:03:03 +02:00
All-3kcis
880fa55dd5
display user-friendly filesize
2018-04-12 15:29:22 +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
d5089f2099
Fix default value of sales tax is used must be set in creation
2018-04-06 20:55: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
9d9f3ddf85
Merge pull request #8502 from ATM-Marc/NEW_create_from_list
...
NEW: generalize use of button to create new element from list
2018-04-05 16:40:15 +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
43f8834b28
Uniformize code with the new module builder framework
2018-03-31 18:48:27 +02:00
Laurent Destailleur
96c73a13f6
Clean code
2018-03-31 16:45:36 +02:00
Marc de Lima Lucio
0366e645d5
NEW: generalize button to create object from list, for most of the lists
2018-03-30 16:54:38 +02:00
Laurent Destailleur
b6e9e0e287
Fix missing hooks
2018-03-30 16:44:58 +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
Regis Houssin
dec0164ff9
Fix: differentiate "card", "contact" and "agenda
2018-03-27 19:12:01 +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
dolibarr95
4b0eede1dd
Delete getCountry() and select field in sql query
...
Delete getCountry() and select field in sql query
2018-03-21 08:53:38 +01:00
dolibarr95
9887d38589
Add dol_print_phone
...
Add dol_print_phone in thirdparty table list.
2018-03-20 11:13:02 +01:00
Laurent Destailleur
9aa4a90543
NEW Stripe online payments reuse the same stripe customer account
2018-03-19 10:57:19 +01:00
Laurent Destailleur
9c221c10aa
Load trans
2018-03-18 21:04:16 +01:00
Laurent Destailleur
1a70e7a7c4
Triggers for Strips payment modes
2018-03-16 16:42:26 +01:00
Laurent Destailleur
f258d31a98
Triggers for Strips payment modes
2018-03-16 16:10:04 +01:00
Laurent Destailleur
e2cbf903ba
Remove deprecated code
2018-03-16 10:33:23 +01:00
ptibogxiv
a8e5927a6e
FIX lang for support more type of stripeconnect account
2018-03-16 10:07:47 +01:00
Laurent Destailleur
eb5d5d07ec
Remove the old deprecated code of doActions in canvas. The doActions of
...
hooks are already available and are better.
2018-03-16 09:58:46 +01:00
Laurent Destailleur
5a397fff72
Fix scrutinizer bugs
2018-03-16 00:16:32 +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
Laurent Destailleur
618627f137
Merge pull request #8393 from atm-maxime/new_siret_check
...
New rule for FR siret value check
2018-03-15 14:27:59 +01:00
Laurent Destailleur
620ceb54e3
Clean code to avoid confusion
2018-03-15 14:25:09 +01:00
Laurent Destailleur
ff4d60dd96
Removed no more required hidden option
2018-03-15 14:00:46 +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
852bf8dab7
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/card.php
htdocs/societe/class/societe.class.php
2018-03-15 01:57:35 +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
6a70d268e0
Fix SQLi reported by op7ica
2018-03-15 01:22:32 +01:00
Laurent Destailleur
c62d68f4be
Fix SQLi reported by op7ica
2018-03-15 01:21:44 +01:00
Laurent Destailleur
821a75cef0
Fix payment modes
2018-03-15 00:53:24 +01:00
Laurent Destailleur
f75334f131
Merge pull request #8386 from ptibogxiv/patch-21
...
FIX support for stripeconnect mode
2018-03-15 00:40:52 +01:00
Laurent Destailleur
87bbb4ef87
Can create card from dolibarr
2018-03-15 00:40:29 +01:00
Laurent Destailleur
c69f5843da
Update card.php
2018-03-15 00:36:56 +01:00
Laurent Destailleur
bf4a0e46aa
Add a credit card on stripe
2018-03-14 21:07:45 +01:00
Laurent Destailleur
302fed8646
More fa image to replace png picto
2018-03-14 20:08:44 +01:00
Laurent Destailleur
8c535db04c
Use .... before end of card number
2018-03-14 17:15:31 +01:00
Laurent Destailleur
9994b1f133
Work on stripe interface
2018-03-14 17:12:32 +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
fmarcet
5140c1c5d2
Fix: Merge categories when merging thirds
2018-03-14 13:25:05 +01:00
ptibogxiv
e179161bfa
FIX support for stripeconnect mode
2018-03-14 12:01:15 +01:00
Laurent Destailleur
268b07bcf0
Can add/delete credit card localy
2018-03-14 11:51:13 +01:00
