lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
91,219 Commits 43 Branches 150 Tags 886 MiB
scrutinizer-patch-1
Commit Graph

3616 Commits

Author SHA1 Message Date
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