Commit Graph

96128 Commits

Author SHA1 Message Date
Thomas Negre
2709e69a32 rename $form into $formcategory 2022-03-24 11:00:37 +01:00
Frédéric FRANCE
e157dc117d
replace debug 2022-03-24 10:51:01 +01:00
Frédéric FRANCE
5f6437cbde
remove debug 2022-03-24 10:46:30 +01:00
stickler-ci
671ab9a412 Fixing style errors. 2022-03-24 08:55:18 +00:00
jpb
71c1f2de3c add class td 2022-03-24 09:51:12 +01:00
jpb
7be3c8b64d ajout de class pour les <td> 2022-03-24 09:51:00 +01:00
jpb
4bc75f6487 ajout class name on create det <td> 2022-03-24 09:50:44 +01:00
jpb
a577956b73 ajout de nom de class dans les entes de ligne det en affichage 2022-03-24 09:50:30 +01:00
jpb
37e589807d add trigger create on expensereportdet 2022-03-24 09:50:16 +01:00
atm-greg
07b0a4e516 Merge branch 'FIX_develop_missing_hooks_for_dictionaryadmin' of github.com:atm-greg/dolibarr into FIX_develop_missing_hooks_for_dictionaryadmin 2022-03-24 09:42:50 +01:00
atm-greg
7fb343b3ef add context 2022-03-24 09:42:02 +01:00
stickler-ci
efbaf030ec Fixing style errors. 2022-03-24 08:41:13 +00:00
atm-greg
f70ceb9398 add more specific context and doAction hook 2022-03-24 09:34:11 +01:00
BB2A Anthony Berton
1266da05ef Lang fr 2022-03-23 19:43:34 +01:00
BB2A Anthony Berton
958b6abdaa pdf_path 2022-03-23 17:31:54 +01:00
Laurent Destailleur
4a80f35aaa Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
2022-03-23 17:26:25 +01:00
Laurent Destailleur
289c32b880 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-03-23 17:23:35 +01:00
Laurent Destailleur
c620757dbc Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/langs/en_US/projects.lang
	htdocs/product/price.php
	htdocs/reception/class/reception.class.php
2022-03-23 17:23:21 +01:00
Laurent Destailleur
161e795759 Look and feel 2022-03-23 17:12:25 +01:00
Laurent Destailleur
32f2499c36 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/langs/en_US/projects.lang
	htdocs/langs/en_US/propal.lang
	htdocs/product/price.php
	htdocs/projet/card.php
	htdocs/reception/class/reception.class.php
2022-03-23 17:04:31 +01:00
Laurent Destailleur
ee611e8517 Hide not important options 2022-03-23 16:56:07 +01:00
Laurent Destailleur
947b6008c8
Merge pull request #20308 from frederic34/patch-1
Fix do not modify entity on group edit
2022-03-23 16:55:55 +01:00
BENKE Charlene
95c8dfcaa0
Update llx_holiday.sql 2022-03-23 16:53:12 +01:00
BENKE Charlene
fcc8a953ae
Update 15.0.0-16.0.0.sql 2022-03-23 16:51:36 +01:00
Laurent Destailleur
94224e9275
Merge pull request #20255 from Easya-Solutions/new-proposal-clone-update-prices
NEW option update prices on proposal cloning
2022-03-23 16:49:12 +01:00
Laurent Destailleur
6167d8a02c
Merge pull request #20302 from marc-dll/13.0_FIX_product_price_update_error_management
FIX: better error management at product selling price update
2022-03-23 16:48:15 +01:00
Laurent Destailleur
6c74fee9ac
Merge pull request #20421 from atm-GregM/DolGetButtonAction_Delivery
FIX: replacing to dolGetButtonAction on Delivery card
2022-03-23 16:41:40 +01:00
Laurent Destailleur
1f7e1c3c91
Merge pull request #20307 from bb2a/complete_label_tab_custom_module
NEW - Record count badge in custom modules tab
2022-03-23 16:40:19 +01:00
Laurent Destailleur
d82aae1871
Update functions.lib.php 2022-03-23 16:39:55 +01:00
Laurent Destailleur
eac3a6cf86
Update functions.lib.php 2022-03-23 16:38:57 +01:00
Laurent Destailleur
5f522c9087
Merge pull request #20388 from atm-john/15.0_fix_missing_lang_trad
Fix missing lang trad
2022-03-23 16:19:14 +01:00
Laurent Destailleur
61ed36e181
Update other.lang 2022-03-23 16:19:06 +01:00
Laurent Destailleur
0cfd374314
Merge pull request #20393 from hregis/new_add_hook_in_contact_list
NEW add selectCompaniesForNewContactListWhere hook
2022-03-23 16:07:50 +01:00
Laurent Destailleur
a06fc4691b
Merge pull request #20394 from hregis/new_add_hook_in_commercialindex
NEW add hooks in commercial index
2022-03-23 16:05:12 +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
Laurent Destailleur
9d2f59a10d
Merge pull request #20397 from hregis/new_add_hook_in_box_customer_and_product
NEW add hooks in customers and products boxes
2022-03-23 16:04:23 +01:00
Laurent Destailleur
c9672e4605
Merge pull request #20442 from grandoc/new_branch_23_03_2022
fix : Nested ternary expressions (without parentheses) deprecated in …
2022-03-23 16:03:36 +01:00
Laurent Destailleur
0e63e09fbb
Merge pull request #20403 from Easya-Solutions/develop_remake_variants_permissions
NEW : Update variants to standard card and list (permissions)
2022-03-23 16:02:34 +01:00
Laurent Destailleur
1c7e2d3034
Merge pull request #20402 from Easya-Solutions/develop_remake_variants
NEW : Update variants to standard card and list
2022-03-23 16:02:08 +01:00
Laurent Destailleur
4e4081c4dd
Merge pull request #20399 from manu8170/develop
Fix a few CSS errors
2022-03-23 16:00:29 +01:00
Laurent Destailleur
b8a74668ff
Merge pull request #20407 from leninrivas/patch-2
Fix delete link in Delivery
2022-03-23 15:59:07 +01:00
Laurent Destailleur
01396cc07a Code comment 2022-03-23 15:58:55 +01:00
Philippe GRAND
b59196d3f9 fix : Nested ternary expressions (without parentheses) deprecated in PHP 7.4. Targeting PHP 8.1.0. 2022-03-23 15:55:50 +01:00
Laurent Destailleur
13311a9ac6
Merge pull request #20416 from atm-GregM/DolGetButtonAction_Expedition
FIX: replacing to dolGetButtonAction on Expedition card
2022-03-23 15:55:31 +01:00
Laurent Destailleur
0e3fa3cdc3
Merge pull request #20420 from defrance/patch-180
NEW : add hook for more buttons
2022-03-23 15:54:13 +01:00
Laurent Destailleur
18636103fc
Merge pull request #20412 from dolibit-ut/patch-383
Update fournisseurs.php
2022-03-23 15:53:43 +01:00
Laurent Destailleur
d92ed35447
Merge pull request #20424 from marc-dll/13.0_FIX_propal_mass_action
FIX: propal list mass action translations and error management
2022-03-23 15:53:28 +01:00
Regis Houssin
fcb1bdaca1 # WARNING: head commit changed in the meantime
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
new_add_hook_load_state_board
2022-03-23 15:53:09 +01:00
Laurent Destailleur
c4e58ab4c0
Merge pull request #20428 from Easya-Solutions/13.0_fix-reception-pmp-with-discount-price
FIX include discount price for PMP after a reception (Issue #20029)
2022-03-23 15:51:22 +01:00
Laurent Destailleur
8dcddde982
Merge pull request #20431 from fmarcet/15.0
Fix: The origin of the stock movement is not being recorded
2022-03-23 15:40:13 +01:00
Laurent Destailleur
0150b9390e
Merge pull request #20436 from hregis/new_add_hook_load_state_board
NEW add hook printFieldWhere in load_state_board function
2022-03-23 15:37:58 +01:00
Laurent Destailleur
5eb6ddd7b4 Merge 20374 and add some fix. Need to be restested. 2022-03-23 15:32:05 +01:00
Laurent Destailleur
2b7797fa75 Clean code 2022-03-23 15:02:45 +01:00
Laurent Destailleur
279a8c9df5 Code comment 2022-03-23 14:39:10 +01:00
Laurent Destailleur
12db2a8f67 Doc 2022-03-23 13:02:49 +01:00
Laurent Destailleur
3e6e67680c Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-03-23 13:02:22 +01:00
Laurent Destailleur
8ad310c8a0 FIX Bad filter on date on salary list 2022-03-23 13:01:24 +01:00
Marc de Lima Lucio
100c48372b FIX: permit access to medias when logged in a different entity 2022-03-22 17:13:48 +01:00
Laurent Destailleur
a5e9970866 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/filefunc.inc.php
2022-03-22 16:58:57 +01:00
Laurent Destailleur
2943e68c42 Fix regression 2022-03-22 16:57:39 +01:00
Regis Houssin
e0e99e8955 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into new_add_hook_load_state_board 2022-03-22 16:51:51 +01:00
Regis Houssin
b95bb58ba0 FIX remove unused global 2022-03-22 16:49:29 +01:00
Regis Houssin
4ca3d45eca NEW add hook printFieldWhere in load_state_board function 2022-03-22 15:51:30 +01:00
GregM
e3a375b948 add &amp 2022-03-22 14:18:48 +01:00
Ferran Marcet
ccf8b01020 Fix: The origin of the stock movement is not being recorded 2022-03-22 13:46:55 +01:00
Laurent Destailleur
f662afa762 Fix sql syntax 2022-03-22 13:37:33 +01:00
Laurent Destailleur
8686e37fa9 Work on generic report. 2022-03-22 13:23:16 +01:00
Regis Houssin
5adcdd6b4e FIX use sanitize instead escape 2022-03-22 12:27:36 +01:00
Regis Houssin
ca3a4839e5 FIX try to fix CodingPhpTest::testPHP error 2022-03-22 12:06:37 +01:00
GregM
4fb62ee15a replacing to dolGetButtonAction on Commande card 2022-03-22 12:04:51 +01:00
Laurent Destailleur
02e2f9815d NEW Add option INVOICEREC_SET_AUTOFILL_DATE_START/END 2022-03-22 11:47:25 +01:00
Marc de Lima Lucio
344c29ae15 FIX: trans 2022-03-22 11:35:37 +01:00
lvessiller
5914f2ac65 FIX include discount price for PMP after a reception (Issue #20029) 2022-03-22 11:17:27 +01:00
Marc de Lima Lucio
3aae8cc3bb FIX: propal list: bad error management for set not ssigned mass action 2022-03-22 10:54:04 +01:00
GregM
00fab67225 add &amp 2022-03-22 10:52:58 +01:00
Marc de Lima Lucio
cf64fc288d FIX: propal list: missing not signed massaction translation keys for transifex 2022-03-22 10:49:03 +01:00
Regis Houssin
4efe10a9a5 NEW add hook printFieldListWhere in "show_contacts" function 2022-03-22 10:46:26 +01:00
GregM
52b562ca69 Merge branch 'Dolibarr_develop' into DolGetButtonAction_Fourn 2022-03-22 10:31:33 +01:00
GregM
f24e1862ee replacing to dolGetButtonAction on Fourn card 2022-03-22 10:29:34 +01:00
Marc de Lima Lucio
d4f55ae116 FIX: propal list: bad error management in mass actions 2022-03-22 10:11:10 +01:00
Regis Houssin
33398a3031 FIX missing object and action hooks parameters 2022-03-22 10:10:42 +01:00
Regis Houssin
c23752b3d5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into new_add_hook_in_contact_list 2022-03-22 10:09:01 +01:00
Marc de Lima Lucio
8ef55eae07 FIX: propal list: missing translation keys for transifex 2022-03-22 10:04:05 +01:00
Laurent Destailleur
2e27c40de4 Fix customreport with link to parents 2022-03-21 22:10:51 +01:00
Laurent Destailleur
40fbaf15fe Add welsh language 2022-03-21 17:12:26 +01:00
GregM
14d91a98fa replacing to dolGetButtonAction on Delivery card 2022-03-21 15:55:53 +01:00
BENKE Charlene
5fd2ec3fda
add hook for more buttons 2022-03-21 15:43:37 +01:00
Laurent Destailleur
dd38f6c35b Prepare 15.0.2 2022-03-21 12:53:03 +01:00
stickler-ci
aec5f4da13 Fixing style errors. 2022-03-21 11:25:46 +00:00
GregM
362352b198 replacing to dolGetButtonAction on Expedition card 2022-03-21 12:18:36 +01:00
Laurent Destailleur
bf7c707d05 Doc 2022-03-21 11:11:36 +01:00
UT from dolibit
1313be410a
Update fournisseurs.php
$helpurl for DE
2022-03-21 10:49:37 +01:00
Laurent Destailleur
cd37d4b403 Code comment 2022-03-21 00:14:42 +01:00
Laurent Destailleur
6c0e333c7d Fix we must user relative timezone of date. 2022-03-20 16:33:35 +01:00
Laurent Destailleur
3293a6f8b8 Fix position of table on new page of PDF 2022-03-19 19:40:20 +01:00
Laurent Destailleur
d5dc29e794 Fix position of image on line 2022-03-19 19:26:58 +01:00
Laurent Destailleur
592a277091 FIX ZATCA Encoding 2022-03-19 19:17:22 +01:00
Laurent Destailleur
cb93ab472d FIX ZATCA Encoding 2022-03-19 19:14:12 +01:00
Laurent Destailleur
79d34bd7d1 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-03-19 18:21:08 +01:00
Laurent Destailleur
9878b04a98 Fix position of text in PDF 2022-03-19 18:20:24 +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
1bb1475b54 Fix phpdoc 2022-03-19 15:03:32 +01:00
Laurent Destailleur
e48d29e4f2 Fix bad position of order 2022-03-19 14:48:22 +01:00
Laurent Destailleur
6a7309305b Fix out of memory with a lot of contracts 2022-03-19 14:41:10 +01:00
Laurent Destailleur
65ed94f9d0 Fix sql is executed twice 2022-03-19 13:14:34 +01:00
Laurent Destailleur
4c293aa49b Update doc 2022-03-19 13:06:30 +01:00
Laurent Destailleur
ef21def5ce NEW Add option MAIN_API_DEBUG to save API logs into a file 2022-03-19 10:42:06 +01:00
Lenin Rivas
12acf2342c
Fix delete link en Delivery
Add actions dellink
2022-03-18 16:01:56 -05:00
GregM
9417545997 clean 2022-03-18 16:58:59 +01:00
GregM
457c760177 clean 2022-03-18 16:57:42 +01:00
BB2A Anthony Berton
f0e3c33dc3 $labeltemp is alwase true 2022-03-18 16:55:53 +01:00
GregM
e2068f1aa8 clean 2022-03-18 16:41:18 +01:00
BB2A Anthony Berton
006dc787c1 method_exists skip fatal error 2022-03-18 16:34:44 +01:00
stickler-ci
3ef36c566f Fixing style errors. 2022-03-18 15:32:11 +00:00
GregM
4c4d18ebd6 clean 2022-03-18 16:28:25 +01:00
GregM
7d059d7fcd clean 2022-03-18 16:27:01 +01:00
GregM
a64bb071cf fix dolGetButtonAction params 2022-03-18 16:20:18 +01:00
Laurent Destailleur
ed631b2b06 Fix doxygen, missing error message 2022-03-18 16:14:20 +01:00
GregM
84ef951a99 replacing to dolGetButtonAction on Salaries card 2022-03-18 16:12:38 +01:00
kamel
26a462dce0 NEW : Update variants to standard card and list (permission) 2022-03-18 15:43:32 +01:00
kamel
1418fd7054 NEW : Update variants to standard card and list 2022-03-18 15:38:44 +01:00
stickler-ci
27000dcfb1 Fixing style errors. 2022-03-18 14:16:09 +00:00
GregM
13522a9fb5 Merge branch 'Dolibarr_develop' into DolGetButtonAction_Ticket 2022-03-18 15:05:53 +01:00
GregM
e4e16bee5d replacing to dolGetButtonAction on Ticket card 2022-03-18 15:04:25 +01:00
manu8170
0d04c8e906
Merge branch 'Dolibarr:develop' into develop 2022-03-18 14:35:37 +01:00
Manu
4e61bbec71 Fix a few CSS errors 2022-03-18 14:30:50 +01:00
Laurent Destailleur
47acdc8f34 Fix database corruption without that. 2022-03-18 14:10:42 +01:00
Laurent Destailleur
4ef9d29b9d Fix missing constraints 2022-03-18 14:09:53 +01:00
Ilias Patsiaouras
b666ec2142 removing dead code free and bom lines are MO lines 2022-03-18 13:46:40 +01:00
Laurent Destailleur
60d9db248f NEW The backup tools has an "lowmemory" for mysqldump on large database 2022-03-18 13:38:07 +01:00
Regis Houssin
f31bf8df48 FIX stickler problem ?? 2022-03-18 13:15:25 +01:00
Regis Houssin
27e893be1d FIX missing element name 2022-03-18 13:13:13 +01:00
Regis Houssin
1d8f170d32 NEW add hooks in customers and products boxes 2022-03-18 12:59:07 +01:00
Laurent Destailleur
62ca286ac9 Try a fix to solve backup that fails on large database 2022-03-18 12:07:00 +01:00
Regis Houssin
b70d3eb8eb FIX uniformize with element name "contact" 2022-03-18 12:05:59 +01:00
Regis Houssin
56280f340f NEW add hooks in commercial index 2022-03-18 11:55:45 +01:00
Regis Houssin
a2f1f4331e NEW add selectCompaniesForNewContactListWhere hook 2022-03-18 11:11:25 +01:00
John BOTELLA
989f00ae63
Update other.lang 2022-03-18 09:42:37 +01:00
lvessiller
566bced9dc FIX escape values and find indexed columns by key 2022-03-18 08:53:54 +01:00
Laurent Destailleur
a970f78c4e css 2022-03-17 21:34:14 +01:00
Laurent Destailleur
876a013ded Fix migration 2022-03-17 19:09:58 +01:00
Laurent Destailleur
167df9593b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/comm/action/card.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/langs/en_US/products.lang
	htdocs/reception/class/reception.class.php
2022-03-17 19:08:51 +01:00
Laurent Destailleur
e46ee982ec FIX Option to manage packaging. FIX size/length/volume of reception
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/install/mysql/migration/14.0.0-15.0.0.sql
	htdocs/langs/en_US/products.lang
	htdocs/reception/card.php
	htdocs/reception/class/reception.class.php
2022-03-17 19:00:19 +01:00
Laurent Destailleur
360a565a29 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2022-03-17 18:54:26 +01:00
Laurent Destailleur
5d415b183e FIX Option to manage packaging. FIX size/length/volume of reception 2022-03-17 18:53:50 +01:00
Thomas Negre
14d9bf0322 fix non-sanitize string in SQL request 2022-03-17 16:05:35 +01:00
Thomas Negre
fc7f097c25 stickler corrections 2022-03-17 16:05:35 +01:00
Thomas Negre
3a82817ad9 avoid displaying warning messages on the public interface 2022-03-17 16:05:35 +01:00
Thomas Negre
ac37c7e4ca link intervention to a ticket contract 2022-03-17 16:05:35 +01:00
Thomas Negre
c68e16c087 admin/ticket.php: correct parameters table 2022-03-17 16:05:35 +01:00
Thomas Negre
c745237ee9 Stickler corrections 2022-03-17 16:05:35 +01:00
Thomas Negre
f92154d057 declare ticket-related constants in modTicket.class.php 2022-03-17 16:05:35 +01:00
Thomas Negre
5fba0dc237 ticket config : select product type matching tickets. 2022-03-17 16:05:35 +01:00
Thomas Negre
2cf433019e FormCategory : create method to select the product category 2022-03-17 16:05:35 +01:00
Thomas Negre
8d997de3bb add options in workflow admin panel : WORKFLOW_TICKET_LINK_CONTRACT, WORKFLOW_TICKET_USE_PARENT_COMPANY_CONTRACTS 2022-03-17 16:05:35 +01:00
Thomas Negre
90ab7da40d Workflow : sort contracts when automatic linking to ticket.
Introduces constants TICKET_PRODUCT_CATEGORY and WORKFLOW_TICKET_USE_PARENT_COMPANY_CONTRACTS.
Rename constant TICKET_AUTO_ASSIGN_CONTRACT_CREATE to WORKFLOW_TICKET_LINK_CONTRACT.
2022-03-17 16:05:35 +01:00
Thomas Negre
a14a63fdad Contrat->getListOfContracts(): allow to sort contracts by contract status, product category, and line status. 2022-03-17 16:05:35 +01:00
Thomas Negre
4d01969a4c Societe: add method to find parent companies 2022-03-17 16:05:35 +01:00
Laurent Destailleur
f75049d0e8
Merge pull request #20356 from aspangaro/16a3
NEW Accountancy - Add subledger account when we generate a transaction with a deposit invoice
2022-03-17 15:34:07 +01:00
GregM
ab87d772c7 update GRH extrafields and more stuff 2022-03-17 15:20:23 +01:00
Laurent Destailleur
49e53abf53 Fix pdf on letter format 2022-03-17 15:01:15 +01:00
ATM john
f1f3a0aa24 Fix missing AutoFill Trad 2022-03-17 14:56:25 +01:00
Alexandre SPANGARO
2ef8bd42df Merge remote-tracking branch 'upstream/develop' into 16a3 2022-03-17 14:44:38 +01:00
Alexandre SPANGARO
0856a49ef0 Fix 2022-03-17 14:44:00 +01:00
Laurent Destailleur
2f2a70c8b7 Clean code 2022-03-17 14:15:28 +01:00
Laurent Destailleur
98cc40ac8d Fix a useless group by 2022-03-17 13:57:50 +01:00
Laurent Destailleur
7aeaaab7f0
Merge pull request #20365 from gdsoftdev/fix_invoicelineorders
Fix : keep row order into invoices created from massactions
2022-03-17 13:37:17 +01:00
Laurent Destailleur
a06b51e06c
Merge pull request #20385 from hregis/fix_missing_object_for_known_current_element
FIX missing to known the current object element
2022-03-17 13:29:22 +01:00
Laurent Destailleur
7d60eefb9a
Merge pull request #20386 from hregis/new_add_hook_in_select_product
NEW add hooks select product list and select thirdparty list function
2022-03-17 13:26:01 +01:00
Laurent Destailleur
5709f168a8 NEW: MAIN_MAIL_AUTOCOPY_TO can accept several email and special keys 2022-03-17 12:55:12 +01:00
lvessiller
254ae943e1 FIX conflicts with develop 2022-03-17 12:33:13 +01:00
lvessiller
a4508e656c NEW pull develop 2022-03-17 12:20:15 +01:00
Laurent Destailleur
43e7547611 Fix sql errors 2022-03-17 11:49:14 +01:00
Laurent Destailleur
3fe9b6b57c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-03-17 11:49:06 +01:00
Quentin VIAL-GOUTEYRON
5bd2951cbd fix char into varchar 2022-03-17 11:38:42 +01:00
Quentin VIAL-GOUTEYRON
4aa87f3f85 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_Availibility_dictionary_field 2022-03-17 11:37:19 +01:00
Laurent Destailleur
4aa93b363a FIX #20387 2022-03-17 11:24:23 +01:00
Regis Houssin
a73b92c871 NEW add selectContactListWhere hook 2022-03-17 11:08:09 +01:00
Frédéric FRANCE
53909828f9
Update card.php 2022-03-17 10:56:14 +01:00
Regis Houssin
dbd0dd7e97 NEW add selectThirdpartyListWhere hook 2022-03-17 10:54:09 +01:00
Regis Houssin
e8b5fa45f2 FIX missing global $hookmanager 2022-03-17 09:55:26 +01:00
Regis Houssin
7a3b051ca0 FIX missing object element and action 2022-03-17 09:51:44 +01:00
Regis Houssin
b0fe8994e4 NEW add hook selectProductsListWhere in select_produits_list function 2022-03-17 09:32:45 +01:00
Regis Houssin
f6c9791f2f FIX missing to known the current object element 2022-03-17 09:18:08 +01:00
Laurent Destailleur
c6338e0de0
Merge pull request #20252 from wdammak/patch-47
Simplification of the code by separating the part given to menu proce…
2022-03-17 02:48:08 +01:00
Laurent Destailleur
6617cbc531
Merge pull request #20256 from marc-dll/13.0_FIX_project_creation_role_not_found
FIX: project creation prevented if PROJECTLEADER contact role renamed, de-activated or deleted
2022-03-17 02:38:11 +01:00
Laurent Destailleur
c147acabe1
Update projects.lang 2022-03-17 02:37:46 +01:00
Laurent Destailleur
63b96e22b0
Update card.php 2022-03-17 02:37:30 +01:00
Laurent Destailleur
62f6686ad0
Merge pull request #20311 from Easya-Solutions/14.0_fix_error_propagation_and_triggers_position_on_delete_propal_line
[FIX] errors propagation and trigger position on delete proposal line
2022-03-17 02:35:30 +01:00
Laurent Destailleur
6885568b7c
Merge pull request #20268 from FHenry/14_fix_date_behaviour_action_card
fix: #20267 #Evarisk same required field displayed on edit or new card
2022-03-17 02:31:16 +01:00
Laurent Destailleur
813e1a23eb Var not defined 2022-03-17 02:13:08 +01:00
Laurent Destailleur
1a8af3509e Fix regression in button 2022-03-17 00:19:48 +01:00
Laurent Destailleur
b1e826da15 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-03-17 00:16:28 +01:00
Laurent Destailleur
079fcacf13 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/langs/en_US/products.lang
2022-03-17 00:16:14 +01:00
Laurent Destailleur
ee0ffae407 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
2022-03-17 00:15:01 +01:00
Laurent Destailleur
5eb51979a2 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-03-17 00:12:17 +01:00
Laurent Destailleur
caf999aa1f Fix scanner in inventory. Fix button must not be clicable if disabled. 2022-03-17 00:12:05 +01:00
Laurent Destailleur
3346d64416
Merge pull request #20305 from fmarcet/14.0
Fix: Error whem generating supplier payment pdf
2022-03-16 22:46:53 +01:00
Laurent Destailleur
5b2e1fc374
Merge pull request #20306 from fmarcet/15.0
Fix: New hidden option MAIN_LINK_BY_REF_IN_LINKTO don't work
2022-03-16 22:41:54 +01:00
Laurent Destailleur
54da09bb71
Merge pull request #20310 from ymollard/15.0
Restoring missing VATIsNotUsed label (15.0)
2022-03-16 22:38:52 +01:00
Laurent Destailleur
71a4a9a48b
Merge pull request #20313 from atm-kevin/NEW_WYSIWYG_ON_PROJECT_TASKS
NEW : Project's tasks WYSIWYG editor
2022-03-16 22:36:24 +01:00
Laurent Destailleur
090b5c41bf
Merge pull request #20316 from atm-gauthier/14.0_fix_round_unitprice_with_MU
FIX : when we use ajax select product fourn price on supplier order for example, unitprice should be rounded with MU and not MT
2022-03-16 22:34:49 +01:00
Laurent Destailleur
3f7a807eba
Merge pull request #20383 from fappels/develop_remember_origin_for_butactionnew
New: Remember origin for newbutton inside create form.
2022-03-16 22:33:00 +01:00
Laurent Destailleur
ef19769249
Merge pull request #20318 from Achicken7301/develop
Vietnam date format, VAT rates
2022-03-16 22:22:20 +01:00
Laurent Destailleur
16f9c74039
Merge pull request #20319 from frederic34/patch-7
tooltip order date is date not datetime
2022-03-16 22:21:55 +01:00
Laurent Destailleur
38a8f52e8b Missing init of model 2022-03-16 22:21:04 +01:00
Laurent Destailleur
f533184f70
Merge pull request #20320 from atm-steve/FIX_Contrat_dolGetButtonAction
FIX: Contrat dolGetButtonAction
2022-03-16 22:18:35 +01:00
Sylvain Legrand
e97932301b DLC and DLUO are reversed in the called function 2022-03-16 22:15:49 +01:00
Laurent Destailleur
228295d29f
Merge pull request #20321 from SylvainLegrand/Fix_error_dispatch_supplier_order_invert_DLC_DLUO
DLC and DLUO are reversed in the called function
2022-03-16 22:14:45 +01:00
Laurent Destailleur
62f84f0357
Merge pull request #20325 from hregis/fix_missing_multientity_managed
FIX missing multientity managed
2022-03-16 22:10:16 +01:00
Laurent Destailleur
55a421870c
Merge pull request #20333 from dolibit-ut/dolibit-ut-patch-menu_auguria_#5
Dolibit ut patch menu auguria #5
2022-03-16 22:09:58 +01:00
Laurent Destailleur
7fb6088e10
Merge pull request #20326 from bb2a/Lang-mass-action-nosign
FIX - Lang mass action propal noSign
2022-03-16 22:09:12 +01:00
Laurent Destailleur
9c8ac4e145
Merge pull request #20334 from dolibit-ut/patch-376
Update step2.php
2022-03-16 22:08:57 +01:00
Laurent Destailleur
79dbfac4ec
Merge pull request #20336 from dolibit-ut/patch-378
Update llx_adherent.sql
2022-03-16 22:03:42 +01:00
Laurent Destailleur
983bfc4ca9 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/dict.php
2022-03-16 22:02:40 +01:00
Laurent Destailleur
f0161d1939 Fix revert a change was not a bug fix but a new feature 2022-03-16 21:59:58 +01:00
Francis Appels
e55a1f2783 Remember origin for newbutton inside create form. 2022-03-16 21:59:34 +01:00
Laurent Destailleur
b0720902d6 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-03-16 21:53:28 +01:00
Laurent Destailleur
b0525c7a7f
Merge pull request #20358 from atm-greg/FIX_missing_hooks_for_dictionaryadmin
add more specific context and doAction hook
2022-03-16 21:52:25 +01:00
Laurent Destailleur
ab2018e9b4
Merge pull request #20376 from oscim/patch-45
Update notify.class.php
2022-03-16 21:46:15 +01:00
Laurent Destailleur
e0106e1080
Merge pull request #20370 from FHenry/14_fix_default_values_project_card
fix: prededefault setup values for public field (visibility) works
2022-03-16 21:45:45 +01:00
Laurent Destailleur
d9907fe074
Merge pull request #20369 from aspangaro/14p34
FIX Reception - Error on trackid
2022-03-16 21:45:15 +01:00
Laurent Destailleur
ac22b1ce81 # WARNING: head commit changed in the meantime
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2022-03-16 21:31:08 +01:00
Laurent Destailleur
d8bb5c2040 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-03-16 21:27:59 +01:00
Laurent Destailleur
4ad6425d76 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2022-03-16 21:27:34 +01:00
Laurent Destailleur
922a0e58a4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-03-16 21:22:45 +01:00
Laurent Destailleur
143660799b Clean code using dolGetFirstLineOfText() 2022-03-16 21:22:03 +01:00
Laurent Destailleur
fe5bf529db # WARNING: head commit changed in the meantime
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-03-16 20:34:30 +01:00
Laurent Destailleur
4ec58006d8 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-03-16 20:32:23 +01:00
Laurent Destailleur
6c210f72dc Fix missing var declaration and constructor 2022-03-16 20:31:40 +01:00
Laurent Destailleur
89aab0e9d5
Merge pull request #20379 from hregis/new_add_kooks_in_thirdparty_index
NEW add hooks in thirdparty index page
2022-03-16 20:14:42 +01:00
Laurent Destailleur
abbc2ca909
Merge pull request #20377 from aspangaro/14p31
FIX Update icon of module reception
2022-03-16 20:13:55 +01:00
Laurent Destailleur
279b60dca6
Merge pull request #20378 from Hystepik/develop#4
Fix : website preview on closed status page
2022-03-16 20:13:30 +01:00
Laurent Destailleur
600657223b
Update functions.lib.php 2022-03-16 20:12:01 +01:00
Laurent Destailleur
14578820ef Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-03-16 20:10:52 +01:00
Laurent Destailleur
3c9ebfbe32 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	.travis.yml
	htdocs/adherents/card.php
2022-03-16 20:10:35 +01:00
Laurent Destailleur
178cb81037
Merge pull request #20380 from atm-gauthier/fix_allow_operators_in_custom_groups_report
FIX : allow all maths classical operators in custom groups accountancy report
2022-03-16 20:08:35 +01:00
Laurent Destailleur
4ec0804f84 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-03-16 20:05:50 +01:00
Laurent Destailleur
abe542f49e Fix removed the cache.manifest file (useless and pb with some browsers) 2022-03-16 19:45:39 +01:00
Regis Houssin
7437be3578 FIX wrong hooks name 2022-03-16 19:22:48 +01:00
Regis Houssin
cdc3f43a01 NEW add printFieldListWhere hook in product reassort card 2022-03-16 19:09:16 +01:00
Gauthier PC portable 024
4731ce9f1d FIX : allow all maths classical operators in custom groups accountancy report 2022-03-16 16:40:08 +01:00
Regis Houssin
629028a435 NEW add hooks in thirdparty index page 2022-03-16 16:27:25 +01:00
Laurent Destailleur
319f21ef69 Fix regression 2022-03-16 16:23:27 +01:00
Alexandre SPANGARO
8702918806 Use getDolGlobalIntString() 2022-03-16 16:09:09 +01:00
Laurent Destailleur
0102832679 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-03-16 16:01:55 +01:00
Laurent Destailleur
149f3e6517 Fix for #20372 2022-03-16 16:01:03 +01:00
lmarcouiller
133721904d add pre-commit changes 2022-03-16 15:57:04 +01:00
lmarcouiller
43c39d833a Fix bug preview on closed status page 2022-03-16 15:56:39 +01:00
Alexandre SPANGARO
536bae97e8 FIX Update icon of module reception 2022-03-16 15:49:49 +01:00
Laurent Destailleur
8a2d3c0029 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-03-16 15:41:02 +01:00
Laurent Destailleur
d2005a3bb9 Fix regression on extrafields not visible 2022-03-16 15:40:17 +01:00
Florian HENRY
a028e795f7 add missing colspan 2022-03-16 13:54:21 +01:00
Florian HENRY
1951443413 Merge branch '14.0' of github.com:Dolibarr/dolibarr into 14_fix_date_behaviour_action_card 2022-03-16 13:48:33 +01:00
oscim
41fa1f968b
Update notify.class.php
add in var $parameters transmited in hook 
outputlangs and labeltouse for customise by hook
2022-03-16 12:30:30 +01:00
ATM john
4f395a836e fix crabe multidir output 2022-03-16 12:10:10 +01:00
lvessiller
cbbfe68482 FIX stickler-ci 2022-03-16 11:06:14 +01:00
lvessiller
4ad6cc6a65 FIX stickler-ci 2022-03-16 11:00:14 +01:00
lvessiller
6d6e6ff70c NEW clean values and amount in FEC import 2022-03-16 10:49:16 +01:00
Marc de Lima Lucio
8a8462bf57 FIX: holiday monthly report: html entity codes showing in description with WYSIWYG activated 2022-03-16 09:47:57 +01:00
Marc de Lima Lucio
9514062868 FIX: holiday monthly report: wrong 'Employee' and holiday type translations 2022-03-16 09:40:31 +01:00
Florian HENRY
cfa3f2f4a1 fix: prededefault setup values for public field (visibility) works 2022-03-16 09:36:52 +01:00
Alexandre SPANGARO
5a2ed9461f FIX Reception - Error on trackid 2022-03-16 08:58:01 +01:00
Laurent Destailleur
92f82c7474
Merge pull request #20337 from dolibit-ut/patch-379
Update 15.0.0-16.0.0.sql
2022-03-15 19:48:21 +01:00
Laurent Destailleur
09a60e7ecb
Merge pull request #20338 from dolibit-ut/patch-380
Update llx_00_c_country.sql
2022-03-15 19:46:49 +01:00
Laurent Destailleur
8f98007905
Merge pull request #20339 from bb2a/preview
NEW - Preview in latest comm card
2022-03-15 19:46:16 +01:00
Laurent Destailleur
306b58443c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/install/mysql/data/llx_20_c_departements.sql
2022-03-15 19:44:34 +01:00
Laurent Destailleur
f885781919 Merge branch 'croatian_install_data' of https://github.com/mps-it/dolibarr into mps-it-croatian_install_data 2022-03-15 19:42:14 +01:00
Laurent Destailleur
f13e7bb03d
Merge pull request #20341 from daraelmin/patch-8
Fix Warning in htdocs/adherents/card.php
2022-03-15 19:36:54 +01:00
Laurent Destailleur
98dfea0443
Merge pull request #20363 from dolibit-ut/patch-382
Update llx_c_hrm_public_holiday.sql
2022-03-15 19:36:19 +01:00
Laurent Destailleur
2205469fab
Merge pull request #20343 from ptibogxiv/patch-7
Fix for multicompany on online sign url
2022-03-15 19:32:56 +01:00
Laurent Destailleur
6ec272ef36
Merge pull request #20347 from hregis/fix_avoid_php_warning
FIX avoid php warning
2022-03-15 19:27:33 +01:00
Laurent Destailleur
d2d86ce53b
Merge pull request #20353 from Hystepik/develop_v13#1
Fix #20351 : top navbar no longer hiden in extarnal site
2022-03-15 19:23:24 +01:00
Laurent Destailleur
0899caf74d
Update lib_head.js.php 2022-03-15 19:23:17 +01:00
Laurent Destailleur
97fc58c799
Merge pull request #20354 from fappels/14_fix_set_move_stock_on_close_wehen_batch
FIX: Stock move on shipment close and reception close disabled for lot/serial type
2022-03-15 19:21:37 +01:00
Laurent Destailleur
58f5cafc34 FIX #20359 2022-03-15 19:15:02 +01:00
Laurent Destailleur
313228e537
Merge pull request #20362 from dolibit-ut/patch-381
Update llx_20_c_departements.sql
2022-03-15 18:55:56 +01:00
Laurent Destailleur
cf13eb7ac7 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-03-15 18:22:37 +01:00
Jé GDSOFT
ffa6cb0610 fix : keep lines order when creating invoices from orders 2022-03-15 15:47:36 +01:00
Jé GDSOFT
6080e1f988 fix : keep lines order when creating invoices from receptions 2022-03-15 14:59:26 +01:00
UT from dolibit
64525349e0
Update llx_c_hrm_public_holiday.sql
add  fk_departement
see #16646
2022-03-15 13:46:14 +01:00
UT from dolibit
271857189c
Update llx_20_c_departements.sql 2022-03-15 13:29:34 +01:00
Laurent Destailleur
69654b2b43 Fix sort not working on security page to test file upload 2022-03-15 12:14:46 +01:00
stickler-ci
43ab784be2 Fixing style errors. 2022-03-15 10:26:47 +00:00
atm-greg
0be989dceb add more specific context and doAction hook 2022-03-15 11:18:11 +01:00
UT from dolibit
0766355cba
Update llx_adherent.sql
add state -2
2022-03-15 11:04:56 +01:00
stickler-ci
587b2076d8 Fixing style errors. 2022-03-15 08:11:44 +00:00
Florian HENRY
92bfd6893d fix:incoterm bad sql request 2022-03-15 09:10:41 +01:00
Alexandre SPANGARO
5fafa8b642 NEW Accountancy - Add subledger account when we generate a transaction with a deposit invoice 2022-03-15 06:29:26 +01:00
Francis Appels
207aba2e98 FIX: Stock move on shipment close and reception close also moves lot/serial type. 2022-03-14 17:59:18 +01:00
atm-steve
21090963e0
Merge branch 'develop' into NEW_Employee_management_improvement 2022-03-14 17:03:52 +01:00
steve
1555a95ce8 Activate new rights read and write 2022-03-14 16:50:43 +01:00
lmarcouiller
22706b70e9 fix syntax error 2022-03-14 16:21:12 +01:00
Laurent Destailleur
f789fc24f7 Fix filter 2022-03-14 16:20:57 +01:00
lmarcouiller
1a20afe29b Fix #20351 : top navbar no longer hiden in extarnal site 2022-03-14 16:11:34 +01:00
Laurent Destailleur
9961fc6369 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-03-14 14:35:38 +01:00
Laurent Destailleur
57c0e7109a Fix parntership module 2022-03-14 14:35:06 +01:00
lmarcouiller
8d11813ea5 fix security problems and add zstd support 2022-03-14 11:45:23 +01:00
Laurent Destailleur
4b3b9ed66b Look and feel v15 2022-03-14 11:43:58 +01:00
Laurent Destailleur
6ffa4fa7ce Fix setup when js disabled. 2022-03-14 11:19:08 +01:00
stickler-ci
19be5f662d Fixing style errors. 2022-03-14 08:25:15 +00:00
daraelmin
3eebbc0b14
Fix #20263 Accountancy setup displayed with right
Fix #20263 Accountancy setup is displayed only for user with rights->accounting->chartofaccount
2022-03-14 09:24:26 +01:00
Regis Houssin
44b6f8a48d FIX avoid php warning 2022-03-14 09:20:10 +01:00
Khang
3ae22d0fb3
Merge branch 'Dolibarr:develop' into develop 2022-03-14 11:52:01 +07:00
Laurent Destailleur
38c77b00a2 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-03-13 22:19:14 +01:00
Laurent Destailleur
22fb2845ae Fix position of tabs 2022-03-13 18:40:43 +01:00
Laurent Destailleur
2367f0d030 Fix missing badge 2022-03-13 18:39:45 +01:00
Laurent Destailleur
ec4ba46582 NEW Add private and public notes on tax files. 2022-03-13 18:30:31 +01:00
ptibogxiv
b1197d4f4e
Fix for multicompany on online sign url 2022-03-13 15:31:37 +01:00
daraelmin
45df52343b
Fix Warning in htdocs/adherents/card.php
Fix Warning: Creating default object from empty value in htdocs/adherents/card.php on line 1058
2022-03-13 14:42:38 +01:00
Miro Sertić
f22888e426 Add contributor to llx_c_forme_juridique.sql 2022-03-13 14:34:14 +01:00
Miro Sertić
fc59f49b32 Add vat for Croatia 2022-03-13 14:18:14 +01:00
Miro Sertić
339152cf68 Add departments for Croatia 2022-03-13 13:50:11 +01:00
Khang
c57336eb37
Merge branch 'Dolibarr:develop' into develop 2022-03-13 19:15:59 +07:00
Khang
25d31e38ea Add (llx_c_tva.sql) VIETNAM VAT 2022-03-13 19:15:25 +07:00
Miro Sertić
ba4b72e59d Add regions for Croatia 2022-03-13 13:07:42 +01:00
Miro Sertić
22b3c0ccae Add forme juridique for croatia 2022-03-13 13:04:50 +01:00
BB2A Anthony Berton
316380afd2 1 2022-03-12 23:41:16 +01:00
BB2A Anthony Berton
a1ac38ae03 entity 2022-03-12 21:03:11 +01:00
BB2A Anthony Berton
368a247f95 New method 2022-03-12 18:53:27 +01:00
Laurent Destailleur
8410298c7e Fix access to the bank receipt view 2022-03-12 18:23:06 +01:00
Laurent Destailleur
ba3a938f01 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-03-12 18:20:43 +01:00
Laurent Destailleur
a2b880bdbf Fix access to the bank receipt view 2022-03-12 18:20:15 +01:00
BB2A Anthony Berton
899598bbb3 Cop 2022-03-12 16:50:48 +01:00
BB2A Anthony Berton
4f4c95344e Other 2022-03-12 16:36:32 +01:00
UT from dolibit
f808756c3e
Update llx_00_c_country.sql
Bahreïn  -->  Bahrain
Barbade -->  Barbados
Bénin  -->  Benin
Bermudes  -->  Bermuda 
Bhoutan  -->  Bhutan
Bolivie  -->  Bolivia 
Bosnie-Herzégovine  -->  Bosnia and Herzegovina 
Ile Bouvet  -->  Bouvet Island   (Population: 0 ;-))
Territoire britannique de l''Océan Indien  -->  British Indian Ocean Territory 
Bulgarie  -->  Bulgaria
2022-03-12 16:34:15 +01:00
UT from dolibit
19b8d418e2
Update 15.0.0-16.0.0.sql 2022-03-12 16:18:09 +01:00
Laurent Destailleur
961636ea35 CSS 2022-03-12 16:04:00 +01:00
BB2A Anthony Berton
db799d7913 comm card propal preview 2022-03-12 16:00:22 +01:00
UT from dolibit
7d000e4c9f
Update llx_adherent.sql 2022-03-12 15:57:03 +01:00
BB2A Anthony Berton
f3f1c9ba78 comm card order 2022-03-12 15:54:25 +01:00
stickler-ci
277142dcab Fixing style errors. 2022-03-12 13:53:15 +00:00
UT from dolibit
d36d962d36
Update step2.php
some english translations at  //comments
2022-03-12 14:49:54 +01:00
UT from dolibit
993cb70a6f
Update init_menu_auguria.sql 2022-03-12 12:38:58 +01:00
UT from dolibit
4134bf5890
Update init_menu_auguria.sql 2022-03-12 12:31:52 +01:00
UT from dolibit
4438ef74f1
Update init_menu_auguria.sql 2022-03-12 12:29:10 +01:00
UT from dolibit
7ff53ddb74
Update init_menu_auguria.sql 2022-03-12 12:25:49 +01:00
UT from dolibit
bc60a1c819
Update init_menu_auguria.sql 2022-03-12 12:19:13 +01:00
UT from dolibit
bb82e6328d
Update init_menu_auguria.sql 2022-03-12 12:08:53 +01:00
Laurent Destailleur
dc9d8336f5 Fix typo 2022-03-11 17:07:23 +01:00
Laurent Destailleur
06804c3547 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/modulebuilder/template/myobject_list.php
2022-03-11 17:04:23 +01:00
Laurent Destailleur
f72f71a972 FIX Delete of doc and package in modulebuilder 2022-03-11 16:21:28 +01:00
Laurent Destailleur
d71f117e81 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-03-11 15:33:56 +01:00
Laurent Destailleur
11d18fae4a Clean code 2022-03-11 13:36:58 +01:00
Laurent Destailleur
9e3742ab81 Trans 2022-03-11 13:34:14 +01:00
Laurent Destailleur
31aa5515db Debug v15 2022-03-11 12:05:28 +01:00
BB2A Anthony Berton
32b508ae19 Lang 2022-03-11 11:48:50 +01:00
Laurent Destailleur
f2d5221784 Debug ModuleBuilder 2022-03-11 11:26:54 +01:00
BB2A Anthony Berton
80a2499844 Clean 2022-03-11 11:25:49 +01:00
Regis Houssin
193a073b16 FIX missing multientity managed 2022-03-11 11:18:09 +01:00
BB2A Anthony Berton
f2377627ec Add template custom module 2022-03-11 10:50:11 +01:00
Regis Houssin
c9cc067075 FIX missing parenthesis 2022-03-11 10:48:51 +01:00
Regis Houssin
e59befa76b Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into fix_missing_advanced_perms 2022-03-11 10:46:14 +01:00
Laurent Destailleur
6100bc86f8 FIX css not saved in modulebuilder 2022-03-11 10:32:06 +01:00
Khang
144a11d15e
Merge branch 'Dolibarr:develop' into develop 2022-03-11 13:09:08 +07:00
Laurent Destailleur
bc6249f0eb Better error message 2022-03-10 22:17:04 +01:00
Laurent Destailleur
5516eae056 FIX type smallint in module builder and case in values of a property 2022-03-10 21:31:09 +01:00
Laurent Destailleur
27baeef719 Add sticky left 2022-03-10 20:42:02 +01:00
Laurent Destailleur
5680e7c3d7 FIX Cancel edit on surveyr 2022-03-10 18:26:00 +01:00
Sylvain Legrand
b9a698b3ed DLC and DLUO are reversed in the called function 2022-03-10 17:39:53 +01:00
Laurent Destailleur
994ea81ce0 Fix test send email feature 2022-03-10 17:24:54 +01:00
Steve
b5a5d488f4 Merge branch 'dolibarrdevelop' into WIP_Contrat_dolGetButtonAction 2022-03-10 16:20:45 +01:00
stickler-ci
bf9b6c05a2 Fixing style errors. 2022-03-10 15:20:37 +00:00
steve
f987c30a10 clean comments 2022-03-10 16:19:32 +01:00
kevin
2a09d4821b Resolve merge conflicts 2022-03-10 16:16:42 +01:00
kevin
896c79f27a Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_WYSIWYG_ON_PROJECT_TASKS 2022-03-10 16:13:02 +01:00
kevin
7b3d472fa2 Rework code to best match the standard 2022-03-10 16:10:34 +01:00
Laurent Destailleur
88ffe1827e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	ChangeLog
	htdocs/core/ajax/row.php
	htdocs/filefunc.inc.php
2022-03-10 15:59:09 +01:00
steve
fffbc9eac8 wip: Contrat dolGetButtonAction 2022-03-10 15:56:10 +01:00
Laurent Destailleur
0ec5595504 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/admin/tools/export_files.php
2022-03-10 14:12:57 +01:00
Laurent Destailleur
32a68995d6 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/product/class/product.class.php
2022-03-10 14:08:19 +01:00
Laurent Destailleur
f6cfe0557b FIX exclusion of other backup files into backup file
Conflicts:
	htdocs/admin/tools/export_files.php
2022-03-10 14:04:16 +01:00
Frédéric FRANCE
7291bbf710
tooltip order date is date not datetime
from sql table
date_commande date, -- date de la commande
2022-03-10 13:52:05 +01:00
Gauthier PC portable 024
5b715978e4 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/addline_with_position_choice_develop 2022-03-10 10:02:57 +01:00
Khang
d7fe48ebc0 Vietnam date format
https://en.wikipedia.org/wiki/Date_and_time_notation_in_Vietnam
2022-03-10 14:14:10 +07:00
Laurent Destailleur
eadd8da3d5 FIX exclusion of other backup files into backup file 2022-03-09 23:32:59 +01:00
Laurent Destailleur
cc57d3dbc1 Fix phpcs 2022-03-09 22:25:29 +01:00
BB2A Anthony Berton
1a5beb0664 Fix style 2022-03-09 19:55:55 +01:00
BB2A Anthony Berton
e1e573c532 Add Hook 2022-03-09 19:55:40 +01:00
BB2A Anthony Berton
032b8692b1 Add hook 2022-03-09 19:42:17 +01:00
BB2A Anthony Berton
3a5a74478f Add auther notif 2022-03-09 18:05:07 +01:00
Gauthier PC portable 024
f2aaa27d7b FIX : when we use ajax select product fourn price on supplier order for example, unitprice should be rounded with MU and not MT 2022-03-09 17:41:48 +01:00
steve
c3b22ed26e wip: clean comments 2022-03-09 17:10:53 +01:00
steve
25fcb83b74 wip: reopen button 2022-03-09 16:41:26 +01:00
Laurent Destailleur
2279674f01 Trans 2022-03-09 15:58:23 +01:00
stickler-ci
bb2f57a962 Fixing style errors. 2022-03-09 13:15:30 +00:00
kevin
22249d15c3 Add WYSIWYG Editor on project's tasks description field 2022-03-09 14:09:22 +01:00
javieralapps4up
8ddd37a419
Enabled to add links to local object with local browser in email templates
It is forbidden by default
2022-03-09 13:16:09 +01:00
Steve
dcf5d984b0 Merge branch 'dolibarrdevelop' into WIP_Facture_dolGetButtonAction 2022-03-09 11:49:34 +01:00
Laurent Destailleur
e76afe475b Fix responsive 2022-03-09 11:42:15 +01:00
kamel
1f00dff4da Correction Stickler CI / stickler-ci 2022-03-09 11:40:26 +01:00
kamel
e06c386507 Fix errors propagation and trigger position on delete proposal line 2022-03-09 11:32:07 +01:00
Quentin VIAL-GOUTEYRON
7ae96b9839 convert number into qty 2022-03-09 10:34:23 +01:00
Thomas Negre
7f527b85b0 use double quotes to compose SQL requests 2022-03-09 09:34:50 +01:00
Thomas Negre
93765add38 Travis fix, hopefully. 2022-03-09 09:25:52 +01:00
Thomas Negre
4ad92a04fc stickler corrections 2022-03-09 09:25:52 +01:00
Thomas Negre
9ce51ba4b7 admin/facture: don't show the modify button if not in an HTML form 2022-03-09 09:25:52 +01:00
Thomas Negre
07672b23b9 Langs/bills.lang: add error string for invoice date check 2022-03-09 09:25:52 +01:00
Thomas Negre
288663be36 Facture mass validation: sort by date to avoid conflicts 2022-03-09 09:25:52 +01:00
Thomas Negre
7c866ce6a2 facture/card.php: avoid validating invoices with date anterior to last invoice date 2022-03-09 09:25:52 +01:00
Thomas Negre
eda9622c9c Facture: enhance validation by adding INVOICE_CHECK_POSTERIOR_DATE option 2022-03-09 09:25:52 +01:00
Thomas Negre
ad416ef792 Facture: create method willBeLastOfSameType() 2022-03-09 09:25:52 +01:00
Thomas Negre
02693ba5ea Facture : add config option for INVOICE_CHECK_POSTERIOR_DATE 2022-03-09 09:25:52 +01:00
Thomas Negre
6e08115aa2 introduce constant INVOICE_CHECK_POSTERIOR_DATE in Facture module 2022-03-09 09:25:52 +01:00
Yoan Mollard
8f7c361a12 Restoring missing VATIsNotUsed label
Overwritten by a transiflex sync
2022-03-09 01:32:59 +01:00
Frédéric FRANCE
3dfd92e9c0
Fix do not modify entity on group edit
https://www.dolibarr.fr/forum/t/etoile-globalgroup-dans-les-groupes-dutilisateurs-quelle-signification-quel-usage/38772/26
2022-03-08 21:19:29 +01:00
Laurent Destailleur
c7bb6c3c4c FIX Upload in the filemanager use the Dolibarr methods 2022-03-08 20:46:56 +01:00
Laurent Destailleur
2d93c6b678 Fix template 2022-03-08 19:00:21 +01:00
BB2A Anthony Berton
cef9cf8670 int 2022-03-08 18:34:56 +01:00
BB2A Anthony Berton
eae3fe78f1 init 2022-03-08 18:06:26 +01:00
Ferran Marcet
a14bf4b621 Fix: New hidden option MAIN_LINK_BY_REF_IN_LINKTO don't work 2022-03-08 18:02:55 +01:00
Ferran Marcet
8e944b8b6d Fix: Error whem generating supplier payment pdf 2022-03-08 17:34:51 +01:00
Marc de Lima Lucio
f837845c12 FIX: still prevent project creation if PROJECTLEADER role unavailable, but with a specific error message 2022-03-08 15:07:02 +01:00
Marc de Lima Lucio
e989371651 FIX: better error management at product selling price update 2022-03-08 14:49:26 +01:00
lvessiller
19ad231012 FIX stickler-ci 2022-03-08 12:02:05 +01:00
lvessiller
397776d4a4 FIX check mandatory thirdparty fields for mass action 2022-03-08 11:29:01 +01:00
lvessiller
bbe3cfffb1 FIX stickler-ci 2022-03-08 10:17:47 +01:00
lvessiller
2561fcbb85 FIX translate update prices and add const in proposal setup 2022-03-08 10:06:57 +01:00
Quentin VIAL-GOUTEYRON
b904ea73a6 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_inventory_pmp_hidden_conf 2022-03-08 08:55:21 +01:00
Quentin VIAL-GOUTEYRON
44577b2d1a fix remove delete and add update lxx c availability 2022-03-08 08:51:31 +01:00
Quentin VIAL-GOUTEYRON
771fa0b6ed Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_Availibility_dictionary_field 2022-03-08 08:50:22 +01:00
Alexandre SPANGARO
87b187bded FIX #20279 Accountancy - PostGreSQL - Error on mass update lines already binded 2022-03-08 03:43:40 +01:00
Laurent Destailleur
66f21fc1d0 Fix phpunit 2022-03-07 20:46:09 +01:00
Laurent Destailleur
af54274603 css 2022-03-07 20:09:14 +01:00
Laurent Destailleur
9dfb7b4328 Revert "CSS"
This reverts commit 7847e04925.
2022-03-07 19:46:24 +01:00
Laurent Destailleur
7847e04925 CSS 2022-03-07 19:45:00 +01:00
Laurent Destailleur
1d9a79e980 css 2022-03-07 19:42:57 +01:00
Laurent Destailleur
b339e1a883 Enhance phpunit on sql code testing 2022-03-07 19:37:53 +01:00
Laurent Destailleur
d6852c31b8 Clean code 2022-03-07 19:31:06 +01:00
Laurent Destailleur
6e298a2cb4 Fix phpunit 2022-03-07 19:18:32 +01:00
Laurent Destailleur
ec77b81d1a Prepare 15.0.1 2022-03-07 18:07:20 +01:00
Laurent Destailleur
492c198e46 Make conditions of some corn tasks dynamic. 2022-03-07 18:01:07 +01:00
Laurent Destailleur
7defe26e56 Debug cron to send backup by email. 2022-03-07 17:55:10 +01:00
Laurent Destailleur
82244afb94
Merge pull request #20136 from bb2a/Send-Local-Database-Dump
NEW -  Add util function send backup by mail
2022-03-07 17:37:44 +01:00
Laurent Destailleur
cf0ef207b8
Update cron.lang 2022-03-07 17:37:32 +01:00
Laurent Destailleur
29e278ed36
Update modCron.class.php 2022-03-07 17:33:50 +01:00
Laurent Destailleur
fc139ba9e8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-03-07 17:22:53 +01:00
Laurent Destailleur
fa46966b81 Fix insert must not include the rowid. 2022-03-07 17:22:29 +01:00
Laurent Destailleur
ce52f8a7ed
Merge pull request #20294 from bloxera/develop
CLOSE #20292 Include German public holidays
2022-03-07 17:15:22 +01:00
Laurent Destailleur
32711e5f1f
Merge pull request #20145 from atm-GregM/Fix_dolGetButtonAction
FIX: function dolGetButtonAction change title if html not set
2022-03-07 17:14:33 +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
88b9123a93
Merge pull request #19989 from iouston/patch-2
add target attribute on getNomUrl
2022-03-07 17:10:39 +01:00
Laurent Destailleur
d0ca8af6ee
Update commande.class.php 2022-03-07 17:10:28 +01:00
Laurent Destailleur
660aa7b282
Update commande.class.php 2022-03-07 17:10:00 +01:00
Laurent Destailleur
5bde2b3489 Merge 2022-03-07 16:42:47 +01:00
Laurent Destailleur
c4036345b8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2022-03-07 16:42:28 +01:00
Laurent Destailleur
b1de986fb7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2022-03-07 16:41:44 +01:00
priojk
db12fe9225 CLOSE #20292 Include German public holidays
Definition of German public holidays (those which are
only relevant in some areas are marked with --TLW).
The values are configured during the first initial set-up of
Dolibarr.
2022-03-07 16:38:56 +01:00
Laurent Destailleur
dd9f10b1b6
Merge pull request #20186 from atm-kevin/FIX_Add_Id_In_Formproject
FIX : Add ID into formproject method
2022-03-07 16:34:04 +01:00
Laurent Destailleur
1ecdc7bc20 css 2022-03-07 16:30:39 +01:00
Laurent Destailleur
0020f4e48a
Merge pull request #20222 from thomas-Ngr/develop_new_ticket_notify_at_closing
New - Ticket: notify contacts at closing
2022-03-07 16:23:27 +01:00
Laurent Destailleur
e3113ed341 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-03-07 16:22:13 +01:00
Laurent Destailleur
1ce8ecb43d Clean setup page 2022-03-07 16:21:37 +01:00
Laurent Destailleur
6d772b7627
Merge branch 'develop' into patch-1 2022-03-07 16:08:31 +01:00
Laurent Destailleur
fb2fb46d17 FIX Drag and drop line of files on join files tab 2022-03-07 16:04:55 +01:00
Quentin VIAL-GOUTEYRON
af8ecd1a38 NEW Availibility dictionnary column unit and number 2022-03-07 16:02:49 +01:00
Laurent Destailleur
84b951c2f9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-03-07 15:27:07 +01:00
Laurent Destailleur
54ecf1f98c # WARNING: head commit changed in the meantime
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2022-03-07 15:24:08 +01:00
Laurent Destailleur
e9eef54b45 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-03-07 15:21:54 +01:00
Laurent Destailleur
c4a20685a4 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-03-07 15:21:38 +01:00
Laurent Destailleur
fa707c6015 Fix error from v12 2022-03-07 15:20:55 +01:00
Laurent Destailleur
c0088191f1 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/product/admin/product.php
	htdocs/product/class/product.class.php
2022-03-07 15:19:51 +01:00
Laurent Destailleur
d13ae9f721 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/install/mysql/tables/llx_product_fournisseur_price.sql
	htdocs/product/admin/product.php
	htdocs/product/class/product.class.php
2022-03-07 15:13:25 +01:00
Laurent Destailleur
40b2beff2d Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-03-07 15:06:37 +01:00
Laurent Destailleur
c4061e578d Fix field 2022-03-07 15:06:24 +01:00
Laurent Destailleur
028fc4f004 Fix field 2022-03-07 15:05:45 +01:00
Laurent Destailleur
df0b20aad3
Merge pull request #20241 from noec764/12.0_Product_Fournisseur_Migration
Correction of the modification on the fly of the table llx_product_fournisseur_price
2022-03-07 15:01:40 +01:00
Laurent Destailleur
e085c3989a
Update product.php 2022-03-07 14:59:55 +01:00
Laurent Destailleur
eff4a894c2
Merge pull request #20242 from JohnXLivingston/fix_status_batch_doc
Fix: update status_batch documentation
2022-03-07 14:55:34 +01:00
Laurent Destailleur
6bb49797f8
Merge pull request #20243 from JohnXLivingston/fix_template_name_typo
Fix: typo in template name
2022-03-07 14:55:02 +01:00
Laurent Destailleur
bda5b775de
Merge pull request #20253 from thomas-Ngr/develop_fix_ticket_messages_order_by_date
fix: make ticket messages order by date desc by default
2022-03-07 14:33:04 +01:00
Laurent Destailleur
ee338e442c
Merge pull request #20246 from dolibit-ut/patch-374
Update README.md
2022-03-07 14:32:13 +01:00
Laurent Destailleur
8eaf7a9d8a
Merge pull request #20251 from atm-kevin/FIX_ADD_Init_Hooks_On_Project_Tabs
FIX : Add hooks on several project tabs
2022-03-07 14:31:37 +01:00
Laurent Destailleur
feafbaded2
Update info.php 2022-03-07 14:31:19 +01:00
Laurent Destailleur
2ef42c178b
Update info.php 2022-03-07 14:30:38 +01:00
Laurent Destailleur
acb47a4cc7
Update document.php 2022-03-07 14:29:39 +01:00
Laurent Destailleur
5a1163c9b9
Merge pull request #20257 from FHenry/14_fix_user_mo
FIX: User name in ManufacturingOrder
2022-03-07 14:25:20 +01:00
Laurent Destailleur
6a979dacd6
Merge pull request #20261 from aspangaro/16a3
NEW Dictionaries - add possibility to manage countries in EEC
2022-03-07 14:24:31 +01:00
Laurent Destailleur
7d374dc4f6
Merge pull request #20264 from fmarcet/15.0
Fix: #20161 Can't import thirds. Column Skype doesn't exist
2022-03-07 14:21:42 +01:00
Laurent Destailleur
35e8e370b1
Merge pull request #20269 from atm-gauthier/14.0_fix_refund_tva
FIX : in case of TVA refund, negative amount must be allowed
2022-03-07 14:14:54 +01:00
Laurent Destailleur
e13038dc30
Update product.class.php 2022-03-07 14:06:54 +01:00
Laurent Destailleur
c4f40fa089
Merge pull request #20276 from frederic34/patch-1
Fix wrong upload dir
2022-03-07 13:45:01 +01:00
Laurent Destailleur
403db246bb
Merge pull request #20280 from Achicken7301/develop
Add unit price for {DOL_PRINT_OBJECT_LINES}
2022-03-07 13:44:03 +01:00
Laurent Destailleur
edaf740e78
Update dolreceiptprinter.class.php 2022-03-07 13:43:16 +01:00
Laurent Destailleur
52aed53480 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-03-07 13:24:16 +01:00
Laurent Destailleur
2142440b6c Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/comm/action/index.php
	htdocs/langs/en_US/errors.lang
2022-03-07 13:23:47 +01:00
Laurent Destailleur
621abfd70d Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-03-07 13:21:56 +01:00
Laurent Destailleur
378dab69a6 FIX #19777 #20281 2022-03-07 13:21:32 +01:00
Laurent Destailleur
d2c95c9a1a
Merge pull request #20284 from frederic34/patch-5
clean comment
2022-03-07 12:32:49 +01:00
Laurent Destailleur
2e045db155
Merge pull request #20286 from andreubisquerra/develop
Set to default place after close sale in TakePOS
2022-03-07 12:32:34 +01:00
Laurent Destailleur
f4cb5810a7 FIX list of visible type of event was not correctly filtered
FIX Error management on mass action "Approve holiday"
2022-03-07 12:01:34 +01:00
Quentin VIAL-GOUTEYRON
cc591b3a03 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_inventory_pmp_hidden_conf 2022-03-07 10:12:17 +01:00
Laurent Destailleur
e6857c9f64 Fix color in css 2022-03-06 20:31:06 +01:00
andreubisquerra
3715659880
Set to default place after close sale in TakePOS
Set to default place after close sale in TakePOS when Bar Restaurant mode is enabled
2022-03-06 12:27:59 +01:00
Frédéric FRANCE
543c475a71
clean comment 2022-03-06 10:56:17 +01:00
Khang
9cada04261 Add unit price for "free-text product" receipt 2022-03-05 16:58:37 +07:00
Khang
d326fe02cf Feature: unit price for {DOL_PRINT_OBJECT_LINES}
Module "Receipt printers":
add unit price for {DOL_PRINT_OBJECT_LINES} in tabs "template setup"
2022-03-05 07:02:36 +07:00
Laurent Destailleur
893e1571b8 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-03-04 22:43:35 +01:00
Laurent Destailleur
c45d6a3bc7 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-03-04 19:45:02 +01:00
Laurent Destailleur
792dcc6334 FIX creation of the shipment if order contains services - 2/2 2022-03-04 19:14:57 +01:00
Frédéric FRANCE
9d1bcbe55a
Fix wrong upload dir
introduced here https://github.com/Dolibarr/dolibarr/pull/19165
2022-03-04 18:17:23 +01:00
Noé Cendrier
cfabaea645 translation refining 2022-03-04 17:38:39 +01:00
Noé Cendrier
e4f4a07fc6 correct mass action "classify delivered" 2022-03-04 17:31:04 +01:00
steve
665e401564 wip: replace butAction 2022-03-04 17:03:40 +01:00
Laurent Destailleur
444abbbc0e Fix regression 2022-03-04 16:44:33 +01:00
Eric Seigne
744b84cb09 fix #20270 : use product_id in sql only if product_id is defined 2022-03-04 15:20:50 +01:00
Gauthier PC portable 024
7701ae2d19 FIX : in case of TVA refund, negative amount must be allowed 2022-03-04 13:55:52 +01:00
Florian HENRY
801402f46a fix: #20267 2022-03-04 11:58:52 +01:00
Ferran Marcet
8c2c3bf3fb Fix: Can't import thirds. Column Skype doesn't exist 2022-03-04 10:06:24 +01:00
Alexandre SPANGARO
1671b095eb Fix also table llx_c_country 2022-03-04 07:02:40 +01:00
Alexandre SPANGARO
13b69bcf93 NEW Dictionaries - add possibility to manage countries in EEC 2022-03-04 07:00:02 +01:00
steve
436b8fa5b5 apply feedbacks 2022-03-03 16:18:09 +01:00
Florian HENRY
3b06a08aa0 FIX: User name in ManufacturingOrder 2022-03-03 13:56:10 +01:00
Marc de Lima Lucio
7239fa3605 FIX: project creation prevented if PROJECTLEADER contact role renamed, de-activated or deleted 2022-03-03 12:19:47 +01:00
lvessiller
6c172d6441 NEW option update prices on proposal cloning 2022-03-03 11:58:29 +01:00
wdammak
cf43024d5d
Update eldy.lib.php 2022-03-03 11:29:47 +01:00
Thomas Negre
d884fe6532 Make ticket messages order by date desc by default 2022-03-03 10:03:19 +01:00
Laurent Destailleur
aed4d69568 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-03-03 09:49:26 +01:00
Laurent Destailleur
2837c938e6 Fix help easier to understand to avoid lethal situations.
Fix reponsive
2022-03-03 09:41:15 +01:00
Laurent Destailleur
88944656be Doc 2022-03-03 02:05:13 +01:00
Laurent Destailleur
0fed4dae13 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/lib/functions.lib.php
2022-03-03 01:59:31 +01:00
Laurent Destailleur
3c3d6ab0da Fix regression. Add unit test to detect it. 2022-03-03 01:17:44 +01:00
Laurent Destailleur
9bda7ba8c7 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/doleditor.class.php
2022-03-03 00:16:55 +01:00
Laurent Destailleur
a9a2928e63 Responsive 2022-03-03 00:13:35 +01:00
wdammak
dd9a350136
Simplification of the code by separating the part given to menu processing
The goal:
- A simplification of the code for easier maintenance is targeted
- Separation of data to left menu display processing
- Plan in the future to put the left menu data directly in the folders of the modules concerned and which will be loaded automatically by eldy.lib.php or eldy_menus.php (for example add a folder "menus/leftmenu.php" in the module "bank" => "bank/menus/leftmenu.php")... This greatly cleans up the code and makes the modules easier to maintain while also avoiding the massive use of hooks for external modules.
- A reuse of the left menus in other corners of the ERP just by calling the function of the desired menu.
- The code is much lighter! is more readable with easier display order modification!
2022-03-02 22:41:00 +01:00
Laurent Destailleur
c452428d12 Fix label of menu 2022-03-02 22:20:05 +01:00
Laurent Destailleur
f0e95a2d20 Fix a default value is creating a letal blocking situation 2022-03-02 22:05:35 +01:00
kevin
ad5a18996d Replace id by class 2022-03-02 21:00:07 +01:00
kevin
c71bebfd21 Add Init Hooks on several project tabs 2022-03-02 20:48:46 +01:00
Laurent Destailleur
940417efe2 FIX payment not completed when using Paypal. 2022-03-02 15:13:17 +01:00
Steve
8f07c22d70 Merge branch 'dolibarrdevelop' into WIP_Employee_management_improvement 2022-03-02 14:51:46 +01:00
steve
9900e5dd31 Clean 2022-03-02 14:51:16 +01:00
Laurent Destailleur
a7cb3fa492 Clean log 2022-03-02 14:44:14 +01:00
steve
e2f727ef55 feat: langs trans ref_employee and national registration number 2022-03-02 14:21:49 +01:00
Laurent Destailleur
66b0f253b6 Clean code 2022-03-02 12:41:21 +01:00
Laurent Destailleur
d15c303590 Fix missing button 2022-03-02 11:57:19 +01:00
steve
dcabd046d9 feat: add ref_employee and national_registration_number fields 2022-03-02 11:52:44 +01:00
Laurent Destailleur
5ffac5f3ee Fix typo 2022-03-02 11:38:32 +01:00
Laurent Destailleur
8051128665 Split section experimental and stable 2022-03-02 11:37:19 +01:00
Steve
cb17f2029e wip: add ref_employee and national_registration_number fields 2022-03-02 11:20:07 +01:00
UT from dolibit
d78f76447c
Update README.md
http://help.luracast.com/restler/examples/  - don't work anymore
replaced by   https://restler3.luracast.com/examples/index.html
2022-03-02 00:29:07 +01:00
Laurent Destailleur
72965fdb2e # WARNING: head commit changed in the meantime
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-03-01 19:13:28 +01:00
Laurent Destailleur
3e1580475c Fix phpunit 2022-03-01 19:05:33 +01:00
Laurent Destailleur
7c253c7e28 Clean code 2022-03-01 19:05:00 +01:00
Laurent Destailleur
762de973eb Fix sql injection 2022-03-01 18:43:16 +01:00
Laurent Destailleur
e5fd841fe3 Make verifCond more robust against RCE 2022-03-01 18:21:30 +01:00
Laurent Destailleur
12b2a10865 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-03-01 18:15:13 +01:00
Laurent Destailleur
883f13b388 Fix regression verifCond 2022-03-01 18:14:24 +01:00
John Livingston
1ece554c92
Fix: typo in template name
There was a typo in generated HTML comment.
2022-03-01 17:39:38 +01:00
Laurent Destailleur
b79ad197ec FIX Missing the field date start/end in export supplier invoice/order 2022-03-01 17:29:22 +01:00
Laurent Destailleur
237b6fc922 Fix value recommended 2022-03-01 17:07:28 +01:00
Laurent Destailleur
358f21f06e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/html.formother.class.php
	htdocs/core/customreports.php
2022-03-01 16:48:29 +01:00
John Livingston
29eec8444e
Fix: update status_batch documentation
$product->status_batch has a new possible value that was not documented.
2022-03-01 16:41:07 +01:00
Laurent Destailleur
2a48dd349e Fix #hunterb03d4415-d4f9-48c8-9ae2-d3aa248027b5 2022-03-01 16:38:06 +01:00
stickler-ci
5c3b0847c2 Fixing style errors. 2022-03-01 15:20:28 +00:00
noec764
f1af7ca2f2
Update product.php 2022-03-01 16:17:32 +01:00
Noé Courtier
035bc32323 Correction of the modification on the fly of the table llx_product_fournisseur_price by an addition in the script creation of the table as well as in the script of version upgrade from 12 ->13 2022-03-01 16:14:31 +01:00
Laurent Destailleur
d76e002822 Fix explanation on setup page 2022-03-01 15:17:03 +01:00
Laurent Destailleur
bd288f980d FIX On large proposal or invoice, fix n(n+1) sql into a n sql. 2022-03-01 14:52:47 +01:00
Steve
5bf186c8ce Merge branch 'dolibarrdevelop' into WIP_Employee_management_improvement 2022-03-01 11:42:57 +01:00
steve
1908acb131 feat: add Accountancy code 2022-03-01 11:42:10 +01:00
Anthony Berton
0fd56eb56b
Update 15.0.0-16.0.0.sql 2022-03-01 11:09:26 +01:00
Anthony Berton
b9feefad15
Update 14.0.0-15.0.0.sql 2022-03-01 11:08:31 +01:00
Anthony Berton
eb90beaebe
Merge branch 'develop' into patch-1 2022-03-01 11:07:11 +01:00
Marc de Lima Lucio
e3aae6d2e1 FIX: object cloning: set unique extrafield values to null to prevent duplicates 2022-03-01 10:50:22 +01:00
Regis Houssin
e5fd11c8e0 FIX missing advanced perms 2022-03-01 09:28:38 +01:00
Laurent Destailleur
8c94c2f98c Fix collapse icon 2022-03-01 04:10:50 +01:00
Laurent Destailleur
e4e08c9903 Code simpler to manage collapse of separators. 2022-03-01 04:02:06 +01:00
Laurent Destailleur
54bef2e34f Fix phpcs 2022-03-01 01:57:38 +01:00
Laurent Destailleur
70a18bc15a FIX creation of the shipment if order contains services 2022-03-01 01:28:47 +01:00
Laurent Destailleur
0aa7e7df88 Fix translation on ticket 2022-03-01 00:33:24 +01:00
Laurent Destailleur
a08bbd6acd Fix regression 2022-03-01 00:11:30 +01:00
Laurent Destailleur
9cc79de31b Clean code 2022-03-01 00:02:23 +01:00
Laurent Destailleur
0d024147bf Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-28 22:36:31 +01:00
Laurent Destailleur
dfba29b3c6 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/api/class/api.class.php
	htdocs/compta/facture/card.php
	htdocs/reception/list.php
2022-02-28 22:30:17 +01:00
Laurent Destailleur
20a35147d4 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-02-28 22:22:46 +01:00
Laurent Destailleur
df9fa39d34 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2022-02-28 22:22:10 +01:00
Laurent Destailleur
d101a457c1 Trans 2022-02-28 22:21:40 +01:00
Laurent Destailleur
81e0eb3af0
Merge pull request #20128 from atm-greg/FIX_14.0_missing_hook_receptionlist
fix missing hooks and line total for totalizable extrafields
2022-02-28 22:14:11 +01:00
Laurent Destailleur
2ed7a4431f Doxygen 2022-02-28 22:13:28 +01:00
Laurent Destailleur
67881a7932
Merge branch 'develop' into 16a12_assets_code 2022-02-28 22:03:26 +01:00
Laurent Destailleur
a89fd3c818
Merge pull request #20198 from gdsoftdev/develop
NEW : accoutancy : subleger label input automatic filling when selecting subleger account in select2 list
2022-02-28 21:56:01 +01:00
Laurent Destailleur
8e1fd877f2
Update html.formaccounting.class.php 2022-02-28 21:55:30 +01:00
Laurent Destailleur
50602b1fbe
Update html.formaccounting.class.php 2022-02-28 21:53:05 +01:00
Laurent Destailleur
6447c1e394
Merge pull request #20076 from vincentjdc/html-field-moreparam-morecss
Allow to add more CSS and more params on html fields
2022-02-28 21:50:40 +01:00
Laurent Destailleur
835b0f5f19
Update doleditor.class.php 2022-02-28 21:45:04 +01:00
Laurent Destailleur
c1268a3e39
Merge pull request #20151 from aspangaro/14p34
FIX Invoice - When you create an invoice and defined a thirdparty, fk_account is not retrieved from company card
2022-02-28 21:38:07 +01:00
Laurent Destailleur
b7d20ff20b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-02-28 21:34:17 +01:00
Laurent Destailleur
548cad0508 FIx #20110 2022-02-28 21:30:12 +01:00
Laurent Destailleur
280be9b29f
Merge pull request #20163 from SteveATM/FIX_replace_divbutaction_by_dolgetbuttonaction
FIX: Replace User divbutaction by dolgetbuttonaction
2022-02-28 21:25:25 +01:00
Laurent Destailleur
0bdf720ed4
Merge pull request #20224 from atm-greg/Fix_extrafields_view_and_perms_on_list
Fix extrafields view and perms on list
2022-02-28 21:17:19 +01:00
Laurent Destailleur
ef39c50882
Merge branch '15.0' into patch-1 2022-02-28 21:09:50 +01:00
Laurent Destailleur
47ce7ef5ae
Merge pull request #20199 from fappels/15_fix_fk_shipping_method
FIX: shipping list, e.shipping_method_id should be e.fk_shipping_method.
2022-02-28 21:07:52 +01:00
Laurent Destailleur
19389ca018
Merge pull request #20200 from ymollard/default-type4tickets
Set default ticket type to OTHER if no default exists
2022-02-28 21:03:59 +01:00
Laurent Destailleur
253622acf6
Merge pull request #20206 from fappels/15_fix_product_photo_on_cornas_model
FIX: Show product photo on Supplier order Cornas model.
2022-02-28 21:03:20 +01:00
Laurent Destailleur
6a81ae1099
Merge pull request #20220 from hregis/fix_remove_duplicate_code
FIX remove duplicated code
2022-02-28 20:58:24 +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
5a24552930 Fix doc 2022-02-28 20:03:21 +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
Thomas Negre
b9e0fc7b02 stickler corrections 2022-02-28 19:02:07 +01:00
stickler-ci
c2047f1f5d Fixing style errors. 2022-02-28 17:46:20 +00:00
atm-greg
bc8ea7571b perms can be an expression and must be evaluated 2022-02-28 18:38:37 +01:00
atm-greg
5eef80750a fiw visibility can be an expression and can return 0 2022-02-28 18:37:47 +01:00
Regis Houssin
9cf5bccf43 FIX options should not exists on invoices 2022-02-28 18:13:29 +01:00
Thomas Negre
35531b6328 add strings for email notification on ticket closing 2022-02-28 17:10:46 +01:00
Thomas Negre
472666182e Ticket list: add a warning before mass ticket closing to chose if contacts should be notified 2022-02-28 17:10:46 +01:00
Thomas Negre
e4ed4b8307 Ticket card: enhance closing modal to allow chosing contacts to notify 2022-02-28 17:10:45 +01:00
Thomas Negre
dcc41d0ab7 Ticket triggers: allow to automatically send messages on TICKET_CLOSE event 2022-02-28 17:10:45 +01:00
Thomas Negre
5b1b862687 reformat trigger/interface_50_modTicket_TicketEmail.class.php to create methods for email composition and sending 2022-02-28 17:10:45 +01:00
Thomas Negre
e1e643efba Ticket : add option TICKET_NOTIFY_AT_CLOSING to ticket config panel 2022-02-28 17:10:45 +01:00
steve
91ee90ebeb fix: read employee and write employee 2022-02-28 16:48:08 +01:00
Laurent Destailleur
aff7148ed8 Fix missing error management 2022-02-28 16:39:42 +01:00
Laurent Destailleur
8866d447c7 Fix error message 2022-02-28 16:01:07 +01:00
steve
08fa2dfadd wip: add read employee and write employee 2022-02-28 15:58:23 +01:00
Regis Houssin
e63e53e081 FIX remove duplicated code 2022-02-28 14:10:35 +01:00
Laurent Destailleur
40d67d70d2 Fix module partnership 2022-02-28 12:37:56 +01:00
Laurent Destailleur
32f2eb8c94 Debug v15 2022-02-28 12:13:06 +01:00
Laurent Destailleur
b9649632fa Fix update 2022-02-28 11:53:29 +01:00
Laurent Destailleur
99ddef0530 NEW Add API to get a tempalte invoice 2022-02-28 10:37:03 +01:00
Laurent Destailleur
b598671484 NEW ACE Editor is restored at same cursor position after a save 2022-02-27 14:46:40 +01:00
Frédéric FRANCE
018fc53554
Merge remote-tracking branch 'upstream/develop' into productmerge 2022-02-27 08:40:01 +01:00
Laurent Destailleur
2ce50b6c00 CSS 2022-02-26 19:30:46 +01:00
Laurent Destailleur
5d0408f7af Fix filter on member list 2022-02-26 19:15:40 +01:00
Francis Appels
3e41c9cb97 FIX: Show product photo on Supplier order Cornas model. 2022-02-26 11:13:02 +01:00
Alexandre SPANGARO
18a8eac1cd Modify fix 2022-02-26 07:17:44 +01:00
Laurent Destailleur
fb0e2f9c6c FIX #yogosha9095 2022-02-26 01:00:22 +01:00
Laurent Destailleur
eba20957f3 Fix CSS
Conflicts:
	htdocs/projet/list.php
2022-02-25 21:47:25 +01:00
Laurent Destailleur
acf6d19500 Fix CSS 2022-02-25 21:45:29 +01:00
Laurent Destailleur
488049c6a6 FIX bad position of extrafields for interventions 2022-02-25 20:36:40 +01:00
Laurent Destailleur
adb4af7099 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-25 19:39:34 +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
Laurent Destailleur
f8a5749fc4 # WARNING: head commit changed in the meantime
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-02-25 19:00:10 +01:00
Laurent Destailleur
b989c257ad Fix report on salaries 2022-02-25 18:53:21 +01:00
GregM
79a0aa816f DolGetButtonAction add $usercancreate 2022-02-25 16:42:25 +01:00
Yoan Mollard
4082de422f Set default ticket type to OTHER if no default exists 2022-02-25 16:27:55 +01:00
Francis Appels
c242a0561b Fix shipping list, e.shipping_method_id should be e.fk_shipping_method.
Disabled searchall for shipping method, does not work.
2022-02-25 16:11:16 +01:00
stickler-ci
722b1de2b7 Fixing style errors. 2022-02-25 15:10:10 +00:00
Jé GDSOFT
073431543d accoutancy : subleger label input automatic filling when selecting subleger account in select2 list 2022-02-25 16:07:44 +01:00
Anthony Berton
647104cbb6
Update llx_societe.sql 2022-02-25 14:54:21 +01:00
Anthony Berton
24be131600
Update 14.0.0-15.0.0.sql 2022-02-25 14:51:40 +01:00
Laurent Destailleur
a6a6c588db Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-02-25 14:37:28 +01:00
Laurent Destailleur
ac67a5a2bb Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-02-25 14:34:25 +01:00
Laurent Destailleur
def0c76ec6 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-02-25 14:31:37 +01:00
Laurent Destailleur
971c0fc764
Merge pull request #20147 from Hystepik/develop_safe_v14
Fix : fix error of permission in holiday
2022-02-25 14:30:05 +01:00
Laurent Destailleur
a0baea1e6b
Merge branch 'develop' into FIX_replace_divbutaction_by_dolgetbuttonaction 2022-02-25 14:20:24 +01:00
Laurent Destailleur
4f054481d9
Merge branch 'develop' into 16a12 2022-02-25 14:15:08 +01:00
Laurent Destailleur
84db3437bd Add missing ' in command 2022-02-25 14:13:42 +01:00
Laurent Destailleur
eb6383ff1d
Merge pull request #20165 from atm-lena/FIX_SalaryPaiement_RapportCompta
Display Salary Paiement on compta report
2022-02-25 14:02:32 +01:00
Laurent Destailleur
a2dea71b4d
Merge pull request #20172 from Dolibarr/atm-maxime-patch-1
Fix #20171 permissiontoadd
2022-02-25 14:00:13 +01:00
Laurent Destailleur
7d6cbe0800
Merge pull request #20173 from thomas-Ngr/develop_new_SEPA_PmtTpInf_CdtTrfTxInf
NEW: SEPA XML - option to place payment Type Info at Credit transfer Transaction level
2022-02-25 13:48:32 +01:00
Laurent Destailleur
f4f75e1d0e
Merge pull request #20175 from bloxera/15.0
Fix #20141 generation of intervention
2022-02-25 13:44:03 +01:00
Laurent Destailleur
92daeeb5c9
Merge pull request #20179 from atm-gauthier/NEW/solde_until_date
NEW : solde() function evolution to be able to get solde until a chosen date
2022-02-25 13:35:33 +01:00
Laurent Destailleur
e5805f401a
Merge pull request #20185 from SylvainLegrand/new_ficheinter_keep_extrafield_format_from_origin
keep extrafield format from origine
2022-02-25 13:33:12 +01:00
Laurent Destailleur
a92a21b65b
Merge pull request #20184 from aspangaro/16a3
NEW Accountancy - Add date from/to on expense report binding & uniformize
2022-02-25 13:29:16 +01:00
Laurent Destailleur
28d91bfcf4
Merge pull request #20187 from SylvainLegrand/Debug_TCPDF_file_name
Debug TCPDF file name with spaces
2022-02-25 13:21:41 +01:00
Sylvain Legrand
cb86224613 new : allow to show all logos on a table 2022-02-25 13:17:05 +01:00
Laurent Destailleur
09f8c63ed3
Merge pull request #20188 from SylvainLegrand/new_allow_show_logos_in_table
new : allow to show all logos on a table
2022-02-25 13:12:48 +01:00
Anthony Berton
a9450f5673
Update societe.php 2022-02-25 11:50:41 +01:00
Jé GDSOFT
1040555baf accoutancy : subleger label input automatic filling when selecting subleger account in select2 list 2022-02-25 11:26:56 +01:00
GregM
22aae26f71 update product card 2022-02-25 10:27:26 +01:00
GregM
6e938c019f Merge branch 'DolGetButtonAction_Product' into DolGetButtonAction_Product_card 2022-02-25 10:17:45 +01:00
GregM
a761afe5ed FIX add dolGetButtonAction on Product 2022-02-25 10:14:39 +01:00
kevin
22fc4317be Add init hooks on several supplier tabs 2022-02-25 09:37:36 +01:00
Sylvain Legrand
e8ef2a8d8c new : allow to show all logos on a table 2022-02-25 09:33:08 +01:00
Sylvain Legrand
30d8174ac5 Debug TCPDF file name with spaces 2022-02-25 09:26:19 +01:00
kevin
aabfdfa212 Format code 2022-02-25 09:20:36 +01:00
kevin
d2cbead203 Add an ID into formproject method to be able to target 2022-02-25 09:17:18 +01:00
Sylvain Legrand
61aa80c865 keep extrafield format from origine 2022-02-25 09:13:16 +01:00
Alexandre SPANGARO
6b4c4f19ab NEW Accountancy - Add date from/to on expense report binding & uniformize 2022-02-25 04:55:55 +01:00
Laurent Destailleur
c097ee5331 FIX #yogosha9089 2022-02-25 01:49:38 +01:00
Laurent Destailleur
8c61a29051 Show value of short_open_tags 2022-02-25 01:30:34 +01:00
Laurent Destailleur
117e1057e1 FIX #yogosha9083 2022-02-24 18:29:24 +01:00
Laurent Destailleur
98da84f9b2 FIX #yogosha9086 2022-02-24 18:15:04 +01:00
Laurent Destailleur
f0c5fe31f8 FIX #yogosha9083 2022-02-24 17:49:52 +01:00
stickler-ci
a0bc41cdba Fixing style errors. 2022-02-24 14:32:59 +00:00
Gauthier PC portable 024
517562b465 NEW : solde() function evolution to be able to get solde until a chosen date 2022-02-24 15:26:11 +01:00
Thomas Negre
4d2dde0fe4 fix bookmarks info bubble 2022-02-24 14:38:28 +01:00
Laurent Destailleur
ba3856f9e9 Fix regression 2022-02-24 14:21:28 +01:00
Laurent Destailleur
a6e7a41e98 FIX Reduce flash effect on collapse extrafield
FIX Reduce flash effect on edit inline feature.
2022-02-24 12:54:33 +01:00
Laurent Destailleur
118b211807 Fix error on null 2022-02-24 12:37:20 +01:00
GregM
c65680dbcf WIP dolGetButtonAction on Product 2022-02-24 11:48:10 +01:00
priojk
c201ff211f Fix #20141 generation of intervention
When an intervention card was created from the times spent on tasks in a project, the task label was wrong in
the descriptions on the intervention card
2022-02-24 11:10:46 +01:00
stickler-ci
fa4e6bd93a Fixing style errors. 2022-02-24 10:10:41 +00:00
Adrien Raze
146b432acf FIX: PR returns 2022-02-24 11:07:31 +01:00
Laurent Destailleur
4973019630 Fix #hunterb812ea22-0c02-46fe-b89f-04519dfb1ebd 2022-02-24 09:59:16 +01:00
Thomas Negre
7c29b2421d only display SEPA XML option at account creation if module payment by bank transfer is enabled 2022-02-24 09:52:41 +01:00
Atm-Gregr
18c81a1355 Merge branch '14.0' of github.com:Dolibarr/dolibarr into 14.0 2022-02-24 09:34:21 +01:00
Thomas Negre
2d74e4fce1 add field pti_in_ctti in bank_account table description. Change column type to smallint. 2022-02-24 09:30:55 +01:00
Maxime Kohlhaas
a9ce98dfb0
Update document.php 2022-02-24 03:11:43 +01:00
Laurent Destailleur
43c3869f08 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-24 01:01:43 +01:00
Laurent Destailleur
c5cd6a5f3c Fix css 2022-02-24 00:17:49 +01:00
Laurent Destailleur
2f0040e9c1 Fix phpunit 2022-02-23 19:24:17 +01:00
Thomas Negre
83ed380e6b display XML SEPA config option only if 'payment by bank transfer' module is enabled 2022-02-23 16:36:57 +01:00
Thomas Negre
f2c85786ae add en_US strings 2022-02-23 16:24:32 +01:00
Thomas Negre
af4e1667e0 Payment by bank transfer: create optionnaly place payment type information (PmtTpInf) in credit transfer transaction information (CdtTrfTxInf)
- introduce PAYMENTBYBANKTRANSFER_FORCE_HIGH_PRIORITY const
2022-02-23 16:23:25 +01:00
Thomas Negre
7a13112ad8 bank card interface modification to allow configuration of payment type information in SEPA XML 2022-02-23 16:22:37 +01:00
Thomas Negre
6136de6a4a add 'pti_in_ctti' property for Account object. Update related methods. 2022-02-23 16:22:19 +01:00
Thomas Negre
80d85b4239 db migration: add a column in llx_bank_account to store the expected SEPA format concerning PmtTpInf. 2022-02-23 16:17:18 +01:00
GregM
c1c9682d08 Merge branch 'Fix_dolGetButtonAction' of github.com:atm-GregM/dolibarr into updateButtonsGregM 2022-02-23 16:01:38 +01:00
GregM
cf470c2306 Add auto tooltip 2022-02-23 16:01:07 +01:00
GregM
114827934e Fix merge conflict 2022-02-23 15:51:44 +01:00
Steve
f70e97bafa fix: travis 2022-02-23 15:45:50 +01:00
GregM
5efbe5a429 Merge branch 'develop' of github.com:Dolibarr/dolibarr into updateButtonsGregM 2022-02-23 15:44:04 +01:00
GregM
6a8b20b3c0 Merge branch 'Fix_dolGetButtonAction' of github.com:atm-GregM/dolibarr into updateButtonsGregM 2022-02-23 15:37:36 +01:00
GregM
3edd478a46 Fix empty url : dont add token 2022-02-23 15:36:43 +01:00
GregM
74bfdb0842 fix retour 2022-02-23 15:34:17 +01:00
atm-lena
ed6f4b4ee1 Display Salary Paiement on compta report 2022-02-23 15:33:51 +01:00
Steve
bd6c547b4d fix: merge develop 2022-02-23 15:20:45 +01:00
Steve
6feda05aeb Merge branch 'develop' of github.com:Dolibarr/dolibarr into FIX_replace_divbutaction_by_dolgetbuttonaction 2022-02-23 15:19:37 +01:00
Steve
6047e4e90b fix: travis + stickler 2022-02-23 15:06:58 +01:00
Steve
b99557e60c fix: feedback travis 2022-02-23 14:59:39 +01:00
Steve
c7077ef1d7 fix: send mail title 2022-02-23 14:49:12 +01:00
Laurent Destailleur
64ce13e273 Clean setup page 2022-02-23 13:20:14 +01:00
Laurent Destailleur
88f1ae9c13 NEW A module can embed a sql script run at each Dolibarr upgrade 2022-02-23 12:55:15 +01:00
Laurent Destailleur
e119ea0524 css 2022-02-23 12:31:32 +01:00
lmarcouiller
57ed890b73 NEW : dol_uncompress new extensions 2022-02-23 12:28:37 +01:00
Steve
f6985ae546 merge develop 2022-02-23 12:25:44 +01:00
GregM
b954608443 Update card 2022-02-23 12:09:15 +01:00
Steve
9a95fc7a00 wip: pull request feedback 2022-02-23 11:13:31 +01:00
Steve
c26b1e58a2 wip: pull request feedback 2022-02-23 11:09:59 +01:00
Steve
26e23219e6 feat: dolGetButtonAction 2022-02-23 10:34:54 +01:00
GregM
f866f9641e update change on another PR 2022-02-23 10:12:43 +01:00
GregM
5dcb4c85ee fix dolGetButtonAction societe card 2022-02-23 10:03:48 +01:00
GregM
e21a9bdd7d WIP dolGetButtonAction lib 2022-02-23 09:25:43 +01:00
Alexandre SPANGARO
7f29668c62 Increase the length of the ref_supplier field 2022-02-23 06:43:01 +01:00
Alexandre SPANGARO
0510d84263 FIX Invoice - When you create an invoice and defined a thirdparty, fk_account is not retrieved from company card 2022-02-23 06:08:20 +01:00
Laurent Destailleur
73b04deb19 Fix error management. 2022-02-23 00:17:49 +01:00
Laurent Destailleur
e96061dd18 Fix phpunit SecurityTest 2022-02-22 23:46:57 +01:00
Laurent Destailleur
77e2969411 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-22 22:27:32 +01:00
Laurent Destailleur
c7c0c75429 Clean code 2022-02-22 22:27:09 +01:00
Laurent Destailleur
e0c24e5d29 Enhance WAF 2022-02-22 22:19:32 +01:00
Laurent Destailleur
27cc6078ed Clean code 2022-02-22 22:15:29 +01:00
Laurent Destailleur
d6786459b4 FIX #yogosha9054 2022-02-22 22:03:34 +01:00
Frédéric FRANCE
b277ab9ee3
Merge remote-tracking branch 'upstream/develop' into productmerge 2022-02-22 21:49:17 +01:00
Laurent Destailleur
209ab708d4 FIX #hunterb812ea22-0c02-46fe-b89f-04519dfb1ebd 2022-02-22 21:24:34 +01:00
Laurent Destailleur
c63e2c2981 Website tables are created only if module enabled. 2022-02-22 19:15:37 +01:00
Laurent Destailleur
fb58b7e930 FIX #yogosha9048 2022-02-22 18:49:16 +01:00
Laurent Destailleur
2d841d5b99 Fix param 2022-02-22 18:48:25 +01:00
Laurent Destailleur
8cc0f3bb58 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2022-02-22 18:47:26 +01:00
Laurent Destailleur
1c0ef23316 FIX #yogosha9048 2022-02-22 18:46:46 +01:00
Laurent Destailleur
8a99bc3b04 Try a more complete sanitization 2022-02-22 18:41:14 +01:00
Marc de Lima Lucio
0e0dd1ec6c FIX: invoice pdf: lines originating from deposits were not detailed anymore 2022-02-22 17:42:11 +01:00
Steve
3fb0d307b1 wip: clean comments 2022-02-22 17:23:34 +01:00
Marc de Lima Lucio
1574254dcf FIX: viewimage.php: bad call to dol_check_secure_access_document() caused images to be blocked with multicompany from entities > 1 2022-02-22 17:13:26 +01:00
stickler-ci
19dbed1804 Fixing style errors. 2022-02-22 16:10:56 +00:00
lmarcouiller
65ecd2f3ef Fix : fix error of permission in holiday 2022-02-22 17:06:10 +01:00
Laurent Destailleur
21069dd9a5 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-02-22 16:44:31 +01:00
Laurent Destailleur
f544219d92 FIX permission to download files of expense report with readall. 2022-02-22 16:44:17 +01:00
steve
679665fb08 feat: dolGetButtonAction for Modify 2022-02-22 15:39:02 +01:00
GregM
e107423c21 fix : change title if html not set 2022-02-22 12:25:30 +01:00
steve
ad4a3c63da feat: dolGetButtonAction for Delete 2022-02-22 12:19:24 +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
Laurent Destailleur
aa8932a3a4 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-02-22 10:59:02 +01:00
Laurent Destailleur
6b29b2d9dc Add preg_quote 2022-02-22 10:51:51 +01:00
GregM
b728ad871c WIP dolGetButtonAction 2022-02-22 10:06:05 +01:00
steve
fefd4a407b feat: dolGetButtonAction for Enable and disable user 2022-02-22 09:43:09 +01:00
Laurent Destailleur
ff0c4ef635
Merge pull request #19952 from thomas-Ngr/develop_new_ticket_display_statut_warning
NEW : optional display warning icons on ticket list
2022-02-22 01:35:33 +01:00
Laurent Destailleur
2c5d88d7a6
Merge pull request #20138 from defrance/patch-178
fix : bad redirection after create
2022-02-22 01:17:22 +01:00
Laurent Destailleur
1c5541db1f
Merge pull request #20121 from ptibogxiv/patch-6
FIX error with php8
2022-02-22 00:59:26 +01:00
Laurent Destailleur
741fabb983
Merge pull request #20133 from atm-lena/NEW_InventoryExtrafields
New inventory extrafields
2022-02-22 00:58:42 +01:00
Laurent Destailleur
eede3aaf17 Fix #yogosha9033 2022-02-21 22:50:32 +01:00
Laurent Destailleur
82250fae62 Fix #yogosha8963 2022-02-21 21:45:28 +01:00
Laurent Destailleur
28ac6a7b55 NEW on redirect of page in website module, GET parameters are kept. 2022-02-21 19:46:11 +01:00
Laurent Destailleur
9dfdce03aa Work on generic reporting tool. 2022-02-21 19:09:26 +01:00
Laurent Destailleur
97ed94fbda NEW Support html content for multiselect component. 2022-02-21 16:54:07 +01:00
BENKE Charlene
5647a04369
fix : bad redirection after create
we have __ID__ on url redirect, so repplace it with the $id value
2022-02-21 16:50:12 +01:00
BB2A Anthony Berton
d28ba84cb3 Mail sendto default and add filter 2022-02-21 16:15:40 +01:00
BB2A Anthony Berton
2595f1f9ee sens dump 2022-02-21 15:56:09 +01:00
stickler-ci
0eb8eab7f0 Fixing style errors. 2022-02-21 14:51:57 +00:00
Quentin VIAL-GOUTEYRON
76e2ee2dde uncomment line 2022-02-21 15:36:58 +01:00
atm-lena
dd6d0a118a Translation 2022-02-21 15:28:38 +01:00
atm-lena
8bbbc843eb Ajout onglet paramètres "Inventaire extrafields" 2022-02-21 15:20:22 +01:00
atm-lena
2e02b3fcae Ajout table "llx_inventory_extrafields" 2022-02-21 14:58:47 +01:00
steve
c78ec56c8f feat: dolGetButtonAction for sendmail 2022-02-21 14:43:00 +01:00
Quentin VIAL-GOUTEYRON
595a6c2782 new pmp column 2022-02-21 14:25:18 +01:00
Laurent Destailleur
00e6d2786d Do not use dol_hash anymore for the name of cookies. 2022-02-21 12:21:43 +01:00
Thomas Negre
d769d856e7 fix $object->status not being set. Avoid using $object->fk_statut. 2022-02-21 12:09:45 +01:00
Thomas Negre
cdbf0bdf6f add translation strings 2022-02-21 12:09:28 +01:00
Thomas Negre
5d10d6cb78 allow delays configuration from ticket module params 2022-02-21 11:57:59 +01:00
Thomas Negre
ad3f7b531e add constants declarations in the module class 2022-02-21 11:50:28 +01:00
Thomas Negre
ffbe094635 Add strings for ticket warnings 2022-02-21 11:46:30 +01:00
Thomas Negre
bf9ca1caaa new : allow to display a warning on untreated tickets. Introduces options TICKET_DELAY_BEFORE_FIRST_RESPONSE and TICKET_DELAY_SINCE_LAST_RESPONSE 2022-02-21 11:43:32 +01:00
Thomas Negre
e8c48a06c0 Correct typos in ticket.lib 2022-02-21 11:42:09 +01:00
Laurent Destailleur
9e6f782907 Clean code 2022-02-21 11:26:10 +01:00
atm-greg
7b655a1ae2 fix missing hooks and line total for totalizable extrafields 2022-02-21 11:25:28 +01:00
steve
0e3ec05028 wip: dolGetButtonAction Nomail 2022-02-21 11:12:06 +01:00
steve
3a2fcaae6c wip: SendMail dolGetButtonAction 2022-02-21 10:12:28 +01:00
Laurent Destailleur
678c3bdb76 Fix switch to login page 2022-02-20 18:07:10 +01:00
ptibogxiv
b8d82671b3
Update filecheck.php 2022-02-20 10:39:59 +01:00
Alexandre SPANGARO
546b3dd4d5 Fix travis 2022-02-20 05:17:06 +01:00
ptibogxiv
996dcdde82
FIX error with php8 2022-02-19 18:34:53 +01:00
Laurent Destailleur
6b8793e171 Fix sql error on web service 2022-02-19 00:41:45 +01:00
Laurent Destailleur
f0f81cd2cd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-18 21:53:46 +01:00
Laurent Destailleur
9a3d8022f3 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-18 21:53:38 +01:00
Laurent Destailleur
05f0f1733d Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-02-18 21:52:33 +01:00
Laurent Destailleur
bd58cf1b37 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-02-18 21:52:18 +01:00
Laurent Destailleur
b0f538387e Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/accountancy/class/bookkeeping.class.php
	htdocs/core/modules/import/import_csv.modules.php
	htdocs/core/modules/import/import_xlsx.modules.php
2022-02-18 21:50:08 +01:00
Laurent Destailleur
e948db69f2 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-02-18 21:46:01 +01:00
Laurent Destailleur
28d8a28be6 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-02-18 21:45:54 +01:00
Laurent Destailleur
959aa0ce59 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2022-02-18 21:44:34 +01:00
Laurent Destailleur
c770e232ff
Merge pull request #20120 from RomainDeschamps/14.0
Add ticket page in user personal landpage
2022-02-18 21:09:23 +01:00
Laurent Destailleur
1c129fd3ea
Merge pull request #20038 from atm-quentin/FIX_12_sort_ht_amount
FIX sort amount ht on cabyprodserv.php
2022-02-18 21:04:52 +01:00
Laurent Destailleur
3e4279f37b
Merge pull request #20083 from ATM-Consulting/FIX_VacantPosition
FIX : HRM | Vacant position option
2022-02-18 20:47:54 +01:00
Laurent Destailleur
72df61b175
Merge pull request #20107 from henrynopo/patch-2
Fix bug - List of supplier order - to show total line
2022-02-18 20:42:30 +01:00
Laurent Destailleur
f295fa8ad4
Merge pull request #20108 from atm-maxime/fix_15_missing_hooks
Fix : add missing formobjectoptions hook on 3 cards
2022-02-18 20:23:09 +01:00
Laurent Destailleur
91eafaea98
Merge pull request #20109 from aspangaro/14p33
FIX Accountancy - On manual transaction with multicompany - Function transformTransaction can validate & delete transaction of an other entity
2022-02-18 20:21:43 +01:00
Laurent Destailleur
19f51347ea
Merge pull request #20111 from atm-greg/Fix_14.0_price_extrafields_rounding_and_currency
fix rounding for price and display currency
2022-02-18 20:19:02 +01:00
Laurent Destailleur
38ddfda95c
Merge pull request #20114 from dolibit-ut/patch-373
add GitHub
2022-02-18 20:14:59 +01:00
Romain DESCHAMPS
5eb4d3408c Update param_ihm.php 2022-02-18 19:31:42 +01:00
Laurent Destailleur
0517e2e2d3 Fix error 2022-02-18 18:35:21 +01:00
lvessiller
1107a60b58 FIX compute rule in FEC import 2022-02-18 16:53:55 +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
3d9cdbf136 FIX Debug v15 2022-02-18 16:24:11 +01:00
Laurent Destailleur
cd9c1acafe Fix missing token 2022-02-18 16:09:23 +01:00
Quentin VIAL-GOUTEYRON
5c2c06de3b NEW : JS inventory autocalc input 2022-02-18 15:39:56 +01:00
Laurent Destailleur
f4f03d03f2 Fix link 2022-02-18 15:23:13 +01:00
Laurent Destailleur
87a5defbd3 Comment 2022-02-18 15:11:54 +01:00
Laurent Destailleur
e41e0f069a Fix creator in PDF. Add log to help to find strange bug 2022-02-18 15:09:52 +01:00
Atm-Gregr
30cde100ff trad us 2022-02-18 14:41:29 +01:00
Laurent Destailleur
61e91656e0 FIX setup of member module
FIX generation of business cards
2022-02-18 14:14:34 +01:00
Laurent Destailleur
694ea8830b Fix missing name and type into template 2022-02-18 13:46:12 +01:00
Laurent Destailleur
dee5d8f9e8 Standardize name of button 2022-02-18 13:45:28 +01:00
UT from dolibit
8a0ee772d3
add GitHub
INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES ( 1, 'github', 'GitHub', 'https://www.github.com/{socialid}', '', 0);
2022-02-18 13:10:38 +01:00
Laurent Destailleur
3ab2308124 Clean code 2022-02-18 12:36:05 +01:00
Laurent Destailleur
aec2579c41 Clean code 2022-02-18 12:22:53 +01:00
Quentin VIAL-GOUTEYRON
879afaa59e NEW : Beginning of PMP management on inventory 2022-02-18 12:16:50 +01:00
stickler-ci
b5afa27774 Fixing style errors. 2022-02-18 10:09:38 +00:00
atm-greg
12c825ba84 fix rounding for price and display currency 2022-02-18 10:50:00 +01:00
Alexandre SPANGARO
3f109aa911 FIX Accountancy - On manual transaction with multicompany - Function transformTransaction can validate & delete transaction of an other entity 2022-02-18 09:24:12 +01:00
Maxime Kohlhaas
7a457478d5 Fix : add missing formobjectoptions hook on 3 cards 2022-02-18 08:23:12 +01:00
Henry
c32cc660a3
Update list.php 2022-02-18 08:16:56 +08: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
Laurent Destailleur
28e6acdae3 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-02-17 20:46:36 +01:00
Laurent Destailleur
aacd439765 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/api/class/api_setup.class.php
2022-02-17 20:46:20 +01:00
Laurent Destailleur
80f1cd8857 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2022-02-17 20:43:51 +01:00
Laurent Destailleur
edc984c6e3 # WARNING: head commit changed in the meantime
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2022-02-17 20:43:22 +01:00
Laurent Destailleur
120a4a608e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-02-17 20:41:20 +01:00
Laurent Destailleur
b013c9a15f Fix duplicate div 2022-02-17 20:37:39 +01:00
Laurent Destailleur
21ebedc755 Fix trans 2022-02-17 20:10:09 +01:00
Laurent Destailleur
6e5c7358de
Merge branch 'develop' into NEW_Needs_net_tab_on_bom 2022-02-17 20:06:38 +01:00
Laurent Destailleur
64ddead1b5
Merge pull request #20051 from ptibogxiv/patch-3
FIX API REST for setup values
2022-02-17 20:05:17 +01:00
Laurent Destailleur
ec71eb410e
Merge pull request #20040 from thomas-Ngr/develop_ticket_config_auto_read
ticket config: auto read ticket
2022-02-17 19:58:01 +01:00
Laurent Destailleur
39bb854ef8
Update ticket.php 2022-02-17 19:57:45 +01:00
Laurent Destailleur
2f3411a31b
Merge pull request #20044 from atm-arnaud/FIX_societe_create_user_author
FIX wrong user author
2022-02-17 19:54:53 +01:00
Laurent Destailleur
7e33794f66
Merge pull request #20047 from simicar29/14-dolistore
Fix urlencode breaking links in Market Place page
2022-02-17 19:54:04 +01:00