lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
109,623 Commits 43 Branches 150 Tags 886 MiB
develop
Commit Graph

1171 Commits

Author SHA1 Message Date
Alexandre SPANGARO
adfae30112 NEW Societe - Add perentity functionality on customer/supplier accountancy auxiliary account 2021-10-07 06:18:39 +02:00
Laurent Destailleur
950fccc186
Merge branch 'develop' into NEW_deposit_payment_terms 2021-10-04 19:06:42 +02:00
Laurent Destailleur
673a2982a5 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/opensurvey/card.php
 2021-09-30 16:32:40 +02:00
Laurent Destailleur
3d4bb66853 Clean code 2021-09-30 15:59:47 +02:00
Laurent Destailleur
1d35d8fd2d CSS popup company 2021-09-29 16:42:52 +02:00
Marc de Lima Lucio
004b52f590 NEW: deposit payment terms: add field into CRUD methods 2021-09-29 12:05:38 +02:00
Laurent Destailleur
deb1965cd5 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/card.php
	htdocs/compta/paiement/list.php
	htdocs/core/class/commonobject.class.php
	htdocs/mrp/mo_list.php
	htdocs/projet/tasks/task.php
	htdocs/public/payment/newpayment.php
 2021-09-20 17:15:12 +02:00
Laurent Destailleur
be2a95ca51 Add language as_IN 2021-09-20 13:01:53 +02:00
Laurent Destailleur
8909702619 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/class/adherent.class.php
	htdocs/bom/class/bom.class.php
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/eventorganization.lang
	htdocs/product/class/productfournisseurprice.class.php
 2021-09-16 13:40:05 +02:00
Laurent Destailleur
3f7a75b0a3 FIX translation into email for member at membership validation. 2021-09-15 19:02:17 +02:00
Mazaud Thomas
2091f915b5
Fix the provided URL 
I made a typo in the URL.
 2021-09-09 16:38:45 +02:00
Mazaud Thomas
512aa92b7e
CLOSE|Close #18663 Make "L'Annuaire des Entreprises" the default provider for SIREN verification. 
Changing the default provider for SIREN verification by making the Government Owned "L'annuaire des Entreprises" the default one.
 2021-09-09 16:31:39 +02:00
Laurent Destailleur
4db234e036 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-09 02:29:10 +02:00
Laurent Destailleur
89ed156d7e Complete getOutstandingBills() 2021-09-09 02:18:50 +02:00
Laurent Destailleur
39dd1e2dd1 Code comment 2021-09-09 02:00:07 +02:00
Laurent Destailleur
3d72a21396 Clean code 2021-08-28 03:09:41 +02:00
Laurent Destailleur
46d993c9a6 Clean code 2021-08-27 22:42:04 +02:00
Laurent Destailleur
3b6559b1a6 Clean code by adding cast int. 2021-08-27 18:53:45 +02:00
Laurent Destailleur
2f225ee7e5 Clean code by adding cast int. 2021-08-27 16:33:03 +02:00
Laurent Destailleur
d4b5ee6c85 Fix cast into variable into sql request. 2021-08-23 17:41:11 +02:00
Laurent Destailleur
ce27feda84 Debug v14 
Fix email collector (Creation of thirparty, set of extrafields)
 2021-07-16 00:12:58 +02:00
Laurent Destailleur
901a158238 Fix backward compatibility 2021-07-14 17:19:43 +02:00
Laurent Destailleur
abb1ad6bf0 Fix sql injection 2021-07-05 18:46:27 +02:00
Laurent Destailleur
d7fbddb8e1 Add rowid/ref in response 2021-06-28 16:45:29 +02:00
Frédéric FRANCE
f92cc8f5a3
fix warnings in propal list 2021-06-24 20:11:40 +02:00
Laurent Destailleur
5cc86d2319 Fix #yogosha6370 2021-06-14 13:51:09 +02:00
Laurent Destailleur
756786f717 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/compta/facture/list.php
	htdocs/core/class/discount.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/lib/pdf.lib.php
	htdocs/core/modules/modFournisseur.class.php
	htdocs/fourn/facture/card.php
	htdocs/holiday/list.php
	htdocs/paybox/admin/paybox.php
	htdocs/paypal/admin/paypal.php
	htdocs/product/price.php
	htdocs/projet/activity/perday.php
	htdocs/projet/activity/permonth.php
	htdocs/projet/activity/perweek.php
	htdocs/stripe/admin/stripe.php
 2021-06-11 19:05:05 +02:00
Laurent Destailleur
1bf63c7862 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/core/lib/functions.lib.php
 2021-06-10 16:53:09 +02:00
Laurent Destailleur
24f8b6386e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/class/commonobject.class.php
 2021-06-10 16:47:45 +02:00
Laurent Destailleur
b7ba9df6b4
Update societe.class.php 2021-06-10 12:59:04 +02:00
Laurent Destailleur
f3d54aada5 Clean code 2021-06-09 23:48:28 +02:00
Laurent Destailleur
fb46ece906 Fix yogosha 6347 2021-06-09 15:36:47 +02:00
ATM john
1aca7efce3 Fix childtablesoncascade doc 2021-06-06 13:15:03 +02:00
Laurent Destailleur
1e657b8621 Fix value of showoncombobox 2021-06-05 15:14:10 +02:00
Laurent Destailleur
71b35ef0e5 Fix regression - can't reset parent company 2021-05-25 12:11:06 +02:00
Laurent Destailleur
857be16e12 Log 2021-05-25 12:03:38 +02:00
Laurent Destailleur
fedf7645b1 Fix regression, can't reset parent company. 2021-05-25 12:02:33 +02:00
Laurent Destailleur
625aab34d6 Fix phpcs 2021-05-20 15:30:33 +02:00
Laurent Destailleur
eb0f4d9765 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-05-20 15:26:26 +02:00
Laurent Destailleur
93501a1147 Fix phpcs 2021-05-20 15:25:56 +02:00
Laurent Destailleur
45bc686f7f Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/commande/list.php
	htdocs/compta/facture/list.php
	htdocs/product/price.php
 2021-05-20 15:05:30 +02:00
Laurent Destailleur
28487fac12
Create societe.class.php 2021-05-20 14:53:50 +02:00
stickler-ci
94ca682cbf Fixing style errors. 2021-05-20 12:51:53 +00:00
Laurent Destailleur
b64c307358
Update societe.class.php 2021-05-20 14:50:02 +02:00
Laurent Destailleur
890d0f8040
Update societe.class.php 2021-05-20 14:38:24 +02:00
stickler-ci
b5ac78d9a0 Fixing style errors. 2021-05-19 16:56:52 +00:00
Sylvain Legrand
8a9c21c642 Update societe.class.php 2021-05-19 18:47:07 +02:00
Laurent Destailleur
21896370a6
Merge pull request #17528 from bb2a/phone_head_document 
Add phone and address in popup Thirdparty info
 2021-05-17 10:16:49 +02:00
Laurent Destailleur
261414cb7f
Update societe.class.php 2021-05-17 10:16:33 +02:00
Laurent Destailleur
1093e66d26
Update societe.class.php 2021-05-17 10:14:14 +02:00
Anthony Berton
1d7765ce12 update phone and address in popup 2021-05-15 02:29:15 +02:00
Laurent Destailleur
866c9d012f Fix fetch for customer and vendor relative discount 2021-05-12 14:19:12 +02:00
Laurent Destailleur
1cf46f9ae9 cast int 2021-05-07 15:11:28 +02:00
Laurent Destailleur
f6305bf551 FIX Sql error 2021-05-04 15:46:38 +02:00
Laurent Destailleur
655056ed31 Debug v14 2021-04-29 12:10:55 +02:00
Laurent Destailleur
2ea1098499 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-04-28 17:09:17 +02:00
Laurent Destailleur
a12b6394be Better error message 2021-04-28 16:41:37 +02:00
Alexandre SPANGARO
d27030df3f Merge remote-tracking branch 'upstream/develop' into 14a39 2021-04-20 04:43:14 +02:00
Laurent Destailleur
4c7547576b Fix label 2021-04-14 12:02:56 +02:00
Alexandre SPANGARO
2f31720896 Maxi debug of societe/product per entity 2021-04-14 04:45:17 +02:00
Alexandre SPANGARO
b3744bce24 Work on split module fournisseur 2021-04-12 06:04:08 +02:00
Laurent Destailleur
9c92dfd3e1 Function set_price_level() has been renamed into setPriceLevel() to 
follow camelcase rules
 2021-04-01 10:05:37 +02:00
Laurent Destailleur
be6bb3a756 FIX #yogosha5746 - next step (work in progress) 2021-03-30 19:12:07 +02:00
Laurent Destailleur
6e422d26f3 FIX #yogosha5746 - next step (wip) 2021-03-30 16:20:18 +02:00
Laurent Destailleur
fb84608586 Clean sql 2021-03-30 03:37:54 +02:00
Laurent Destailleur
de5df84207
Merge pull request #16990 from daraelmin/daraelmin-adh-create-soc 
Close #15830 Add setup option ADHERENT_DEFAULT_CREATE_THIRDPARTY
 2021-03-30 00:55:17 +02:00
daraelmin
c36c4937ea
Update societe.class.php 2021-03-30 00:31:37 +02:00
Laurent Destailleur
b702d2b534 Fix CSRF for more GET 2021-03-29 22:58:44 +02:00
stickler-ci
a01403c4de Fixing style errors. 2021-03-29 20:16:58 +00:00
daraelmin
57b15c1821 use dol_getIdFromCode for TE_PRIVATE 2021-03-29 22:15:28 +02:00
Laurent Destailleur
3a4bb69c05 FIX #yogosha5749 2021-03-29 15:32:09 +02:00
stickler-ci
b7045ef3a0 Fixing style errors. 2021-03-28 17:42:18 +00:00
daraelmin
1ae0e2a920 fix stafix style errorsle fix stale errorfix style errors 2021-03-28 19:38:20 +02:00
daraelmin
6fdff2c3ab autoaffect individual status for thirdparty 2021-03-28 19:19:40 +02:00
Frédéric FRANCE
4cb7c90184
fix stats 2021-03-20 11:38:53 +01:00
Laurent Destailleur
7d1e18f5ab
Merge pull request #16625 from FHenry/dev_EventOrganisation 
new: working on conference or booth object and event type #FoundationFunding
 2021-03-15 11:37:57 +01:00
Laurent Destailleur
12f50a76d7 Fix yogosha #5627 2021-03-14 11:48:39 +01:00
Florian HENRY
862926316a working on list 2021-03-11 19:09:42 +01:00
Laurent Destailleur
c5dac4854a
Merge pull request #16474 from bafbes/abb120370 
fix:fk_region links to region code field and not to the rowid's
 2021-03-01 14:16:14 +01:00
abb
c4a3a289a9 fix:fk_region links to region code field and not to the rowid 2021-02-26 23:39:52 +01:00
Frédéric FRANCE
ebfba19778
code syntax s... t.. dir 2021-02-26 21:17:52 +01:00
Laurent Destailleur
a296b86ee1
Update societe.class.php 2021-02-26 13:15:02 +01:00
Laurent Destailleur
ad63ac6bb0
Update societe.class.php 2021-02-26 13:08:24 +01:00
abb
e97468c138 new:Fetch region_code in societe fetch 2021-02-25 09:02:19 +01:00
Anthony Berton
060bfde082 20200217 2021-02-17 15:26:56 +01:00
Laurent Destailleur
67df1e1b94 Use same visual picto everywhere for nature of thirdparty 2021-02-05 17:29:11 +01:00
Frédéric FRANCE
9e5f0a8cb9
add more infos in link 2021-01-20 18:45:44 +01:00
stickler-ci
93b421238a Fixing style errors. 2021-01-17 01:26:09 +00:00
Anthony Berton
89ac5e8803 1 2021-01-17 02:09:21 +01:00
Laurent Destailleur
4c50f25c12 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-15 11:41:45 +01:00
Laurent Destailleur
ee7aacae54 More complete error message 2021-01-14 15:19:56 +01:00
Laurent Destailleur
cae9dc3acf
Merge pull request #15925 from FHenry/dev_add_tag_contact_thirdpartycontactcreateion 
NEW : Add contact tag and bulk email status on thirparty+contact create form
 2021-01-11 17:28:12 +01:00
Laurent Destailleur
8a3a59dfca
Merge pull request #15636 from aspangaro/14a5 
NEW: Accountancy - Introduce "Level3" - Define account directly in thirdparty
 2021-01-11 17:10:03 +01:00
Florian HENRY
8adfe54949 bulk email management 2021-01-07 17:33:57 +01:00
Florian HENRY
d388ac72f6 add contacg tag on thirdparty and contact création 2021-01-07 17:32:47 +01:00
Laurent Destailleur
b553dbb9d2 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-06 20:23:07 +01:00
Laurent Destailleur
170814c718 Fix missing rollback 2021-01-06 20:21:22 +01:00
Laurent Destailleur
3d96c5a454 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/admin/dict.php
	htdocs/bom/tpl/objectline_create.tpl.php
	htdocs/bom/tpl/objectline_edit.tpl.php
	htdocs/bom/tpl/objectline_view.tpl.php
	htdocs/core/boxes/box_shipments.php
	htdocs/societe/class/societe.class.php
 2021-01-06 20:20:37 +01:00
Laurent Destailleur
4f2c6e2901
Merge pull request #15911 from atm-kevin/Fix_create_contact_from_thirdparty_from_member 
Fix #15829
 2021-01-06 19:33:25 +01:00
kevin
5164a96aa0 Fix #15829 2021-01-06 15:35:33 +01:00