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

4354 Commits

Author SHA1 Message Date
stickler-ci
150a21820f Fixing style errors. 2022-04-13 00:14:23 +00:00
wdammak
5d9cfaa823
Update card.php 2022-04-13 01:09:44 +01:00
lmarcouiller
d41676cf8b Close #20609 : new massaction asign sale representative 2022-04-12 13:57:00 +02:00
Laurent Destailleur
f679392d26 FIX missing picto in combo of mass actions of thirdparties. 2022-04-12 02:26:37 +02:00
Laurent Destailleur
c035ee6f2a Look and feel v16 2022-04-11 19:21:04 +02:00
Laurent Destailleur
b8c8d2af93 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-04-09 00:56:42 +02:00
Laurent Destailleur
6169f76a34 Add log for debug. Make new method for stripe payment an option. 2022-04-08 12:38:49 +02:00
Laurent Destailleur
96c866400f css 2022-04-07 16:05:55 +02:00
Laurent Destailleur
b8d19c9311 Debug v16 2022-04-07 15:59:50 +02:00
Laurent Destailleur
bc7ad806e7 Try to fix a strange logic. 2022-04-07 15:01:20 +02:00
Laurent Destailleur
f2f2ce7d7c
Merge pull request #19555 from OPEN-DSI/fix-thirdparty-modify-tags-not-customer-prospect 
FIX can modify tag in thirdparty card if const enabled
 2022-04-07 14:45:59 +02:00
UT from dolibit
ed9435321f Update societe.class.php 
note_public  => NotePublic
note_private => NotePrivate

see #20419
 2022-04-07 11:08:30 +02:00
wdammak
51837690fe
Avoid duplicate 3rd partires 2022-04-07 01:10:29 +01:00
UT from dolibit
2e890d9d28
Update societe.class.php 
note_public  => NotePublic
note_private => NotePrivate

see #20419
 2022-04-06 21:08:23 +02:00
Laurent Destailleur
0b8f4489c8 css 2022-04-06 15:55:43 +02:00
Laurent Destailleur
f1d5695cb0
Merge pull request #20225 from thomas-Ngr/develop_new_ticket_workflow_auto_link_contract 
NEW: add a workflow to auto link contract on a ticket
 2022-04-02 18:15:27 +02:00
Laurent Destailleur
a51c868a8e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
 2022-04-01 14:40:50 +02:00
Laurent Destailleur
d0ee40e55d # WARNING: head commit changed in the meantime 
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
 2022-04-01 14:39:10 +02:00
Laurent Destailleur
14d8c1045d
Merge pull request #20056 from aspangaro/14p32 
FIX Disable customer type by default if type prospect/customer is disabled
 2022-03-30 12:17:44 +02:00
Laurent Destailleur
e93f1cc507
Update card.php 2022-03-30 12:15:33 +02:00
Laurent Destailleur
fe381ef02e Fix default value of typeent on thirdparty creation. 2022-03-30 10:14:28 +02:00
Regis Houssin
4479ba8015 FIX missing translation keys 2022-03-26 08:32:20 +01:00
Marc de Lima Lucio
cbba7d7d5f Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms 2022-03-25 16:14:53 +01:00
Regis Houssin
e8dae7a8db FIX Multiccompany sharings compatibility 2022-03-24 16:40:51 +01:00
Laurent Destailleur
bc9ec3e2b9
Merge pull request #20395 from hregis/fix_uniformize_with_element_name 
FIX uniformize with element name "contact"
 2022-03-23 16:04:53 +01:00
Regis Houssin
4ca3d45eca NEW add hook printFieldWhere in load_state_board function 2022-03-22 15:51:30 +01:00
Laurent Destailleur
8603d493ad Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contrat/list.php
	htdocs/install/mysql/tables/llx_partnership.key.sql
 2022-03-19 17:34:26 +01:00
Laurent Destailleur
ed631b2b06 Fix doxygen, missing error message 2022-03-18 16:14:20 +01:00
Regis Houssin
b70d3eb8eb FIX uniformize with element name "contact" 2022-03-18 12:05:59 +01:00
Thomas Negre
4d01969a4c Societe: add method to find parent companies 2022-03-17 16:05:35 +01:00
Laurent Destailleur
2f2a70c8b7 Clean code 2022-03-17 14:15:28 +01:00
Regis Houssin
7a3b051ca0 FIX missing object element and action 2022-03-17 09:51:44 +01:00
Regis Houssin
f6c9791f2f FIX missing to known the current object element 2022-03-17 09:18:08 +01:00
Regis Houssin
7437be3578 FIX wrong hooks name 2022-03-16 19:22:48 +01:00
Regis Houssin
629028a435 NEW add hooks in thirdparty index page 2022-03-16 16:27:25 +01:00
Marc de Lima Lucio
4efcbe8799 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms 2022-03-08 15:23:52 +01:00
Marc de Lima Lucio
1993a8d7b1 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms 2022-03-08 15:07:37 +01:00
Laurent Destailleur
dab0095224
Merge pull request #19990 from iouston/patch-3 
add attribute target on getNomurl()
 2022-03-07 17:12:19 +01:00
Laurent Destailleur
d38df4b8a0
Update societe.class.php 2022-03-07 17:11:32 +01:00
Laurent Destailleur
c2fb5d577c Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/install/mysql/migration/14.0.0-15.0.0.sql
	htdocs/langs/en_US/banks.lang
	htdocs/projet/list.php
 2022-02-28 20:12:28 +01:00
Laurent Destailleur
ca236c556a FIX Blocking situation when a payment was deleted in bank. 
FIX Missing or bad permissions
 2022-02-28 19:45:53 +01:00
Laurent Destailleur
409da7f091 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-25 19:17:41 +01:00
Anthony Berton
a9450f5673
Update societe.php 2022-02-25 11:50:41 +01:00
GregM
114827934e Fix merge conflict 2022-02-23 15:51:44 +01:00
GregM
5efbe5a429 Merge branch 'develop' of github.com:Dolibarr/dolibarr into updateButtonsGregM 2022-02-23 15:44:04 +01:00
GregM
74bfdb0842 fix retour 2022-02-23 15:34:17 +01:00
Laurent Destailleur
e119ea0524 css 2022-02-23 12:31:32 +01:00
GregM
b954608443 Update card 2022-02-23 12:09:15 +01:00
GregM
5dcb4c85ee fix dolGetButtonAction societe card 2022-02-23 10:03:48 +01:00
Laurent Destailleur
e96061dd18 Fix phpunit SecurityTest 2022-02-22 23:46:57 +01:00
GregM
059548105c WIP dolGetButtonAction 2022-02-22 12:14:18 +01:00
GregM
b0473c475a wip dolGetButtonAction 2022-02-22 11:48:35 +01:00
GregM
69bb3aaad1 WIP dolGetButtonAction 2022-02-22 11:35:55 +01:00
GregM
b05a5d63b2 WIP dolGetButtonAction 2022-02-22 11:28:33 +01:00
GregM
b728ad871c WIP dolGetButtonAction 2022-02-22 10:06:05 +01:00
Laurent Destailleur
3b6f7bff66 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-18 16:32:51 +01:00
Laurent Destailleur
87a5defbd3 Comment 2022-02-18 15:11:54 +01:00
Laurent Destailleur
dee5d8f9e8 Standardize name of button 2022-02-18 13:45:28 +01:00
Laurent Destailleur
6b8312aab0 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-17 20:51:25 +01:00
Laurent Destailleur
d19aca7192 # WARNING: head commit changed in the meantime 
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
 2022-02-17 20:50:03 +01:00
Frédéric FRANCE
a613553f37
Merge branch 'hookgetnomurl' into patch-1 2022-02-15 18:44:06 +01:00
iouston
1bc80df643
keep the default value for target in getnomurl to '' 2022-02-15 09:32:27 +01:00
Alexandre SPANGARO
5a86f99890 FIX Disable customer type by default if type prospect/customer is disabled 2022-02-13 17:53:22 +01:00
Alexandre SPANGARO
a15353fa33 FIX Disable customer type by default if type prospect/customer is disabled 2022-02-13 13:42:40 +01:00
atm-arnaud
455247565d FIX wrong user author 2022-02-11 11:40:45 +01:00
stickler-ci
7e6279e942 Fixing style errors. 2022-02-04 13:48:25 +00:00
iouston
0cc8e6873f
add attribute target on getNomurl() 2022-02-04 14:44:47 +01:00
habot-it
e0ba321365 Add parent company in action==add of societe card.php 2022-02-01 13:54:25 +00:00
Laurent Destailleur
a182cee8b0 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-01-29 16:49:09 +01:00
Laurent Destailleur
87f05067ca Fix rounding price 2022-01-29 16:47:29 +01:00
Laurent Destailleur
23eda44ba7 Debug v15 2022-01-29 16:43:51 +01:00
Laurent Destailleur
16aa562a13 Debug v15 2022-01-29 16:42:15 +01:00
Sylvain Legrand
b65f849c5d New - Improve the reading of profIDs 2022-01-28 11:22:12 +01:00
Laurent Destailleur
5d176c75db
Merge pull request #19780 from aspangaro/16a7 
NEW Thirdparty - Add rules customer accountancy code is mandatory to validate invoice
 2022-01-25 15:00:47 +01:00
Philippe GRAND
fefbaa739a fix : bad path 2022-01-23 12:21:15 +01:00
Laurent Destailleur
9924333df8
Merge pull request #19883 from grandoc/new_branch_19_01_2022 
fix : bad path
 2022-01-23 12:20:40 +01:00
Laurent Destailleur
e0956c1765 Fix missing token, missing reposition, missing modulepart 2022-01-22 15:33:47 +01:00
Laurent Destailleur
14af64d143 NEW Can removed doc templates from setup page of thirdparty 2022-01-22 15:09:14 +01:00
Philippe GRAND
13329aab2e fix : bad path 2022-01-19 21:18:49 +01:00
Laurent Destailleur
3aea037889 FIX Debug level 3 of accounting account was using wront field 2022-01-13 19:49:38 +01:00
Laurent Destailleur
13510b9929 Clean sortfield, sortorder 2022-01-13 11:17:25 +01:00
Laurent Destailleur
f51720879b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-01-13 11:05:57 +01:00
Laurent Destailleur
dc3670bc91 Clean search_status 2022-01-13 11:00:52 +01:00
Alexandre SPANGARO
960aaded8e NEW Thirdparty - Add rules customer accountancy code is mandatory to validate invoice 2022-01-09 21:08:06 +01:00
Laurent Destailleur
4ce77e62c6 Debug v15 2022-01-09 14:19:55 +01:00
Laurent Destailleur
eddc2a1a26 FIX #yogosha8272 2022-01-08 19:50:55 +01:00
Laurent Destailleur
6708d4a4d4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-01-06 11:15:40 +01:00
Laurent Destailleur
1e467c60f3 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/compta/facture/list.php
	htdocs/product/stock/movement_list.php
 2022-01-06 11:15:28 +01:00
Laurent Destailleur
708f5e5cf1 FIX #19751 2022-01-06 10:54:19 +01:00
Laurent Destailleur
3689940c11
Merge pull request #19744 from javieralapps4up/develop 
FIX: Thirdparty fk_user_creat is not saved
 2022-01-06 10:40:47 +01:00
javieralapps4up
00ee08f262
FIX: Thirdparty fk_user_creat is not saved 2022-01-05 10:47:59 +01:00
Laurent Destailleur
5b8d6e60e4 Debug v15 2022-01-05 10:43:05 +01:00
Laurent Destailleur
809c8f993b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/modules/modCommande.class.php
	htdocs/core/modules/modFournisseur.class.php
	htdocs/core/modules/modPropale.class.php
	htdocs/filefunc.inc.php
	htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php
 2021-12-30 19:03:46 +01:00
Laurent Destailleur
62a74ed428 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php
	htdocs/societe/list.php
 2021-12-30 17:57:45 +01:00
Laurent Destailleur
9f82aa1570 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/modulebuilder/template/admin/setup.php
 2021-12-30 17:51:25 +01:00
lvessiller
f16166c47c FIX title for nature of third party in company list 2021-12-30 15:35:49 +01:00
atm-gregr
3feb3d5b76 double contactcategorie 2021-12-21 14:26:28 +01:00
Laurent Destailleur
0387b9922e FIX error message on sqlfilter in API 2021-12-20 20:49:32 +01:00
Laurent Destailleur
29a09e5cbc typo 2021-12-20 18:49:11 +01:00
Laurent Destailleur
41792dd269 Fix phpunit 2021-12-18 23:55:12 +01:00