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
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