Commit Graph

2627 Commits

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