Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
112,767 Commits 35 Branches 179 Tags 1.7 GiB
e3a0220658
Commit Graph

6602 Commits

Author SHA1 Message Date
Laurent Destailleur
d0db89faf9 debug 2022-05-19 12:02:04 +02:00
Laurent Destailleur
e5cda0b80e Debug v16 2022-05-19 11:55:14 +02:00
atm-florian
0bf588962b FIX 15.0: modules cannot declare more than 1 cron job using the same method with different parameters 2022-05-19 09:45:37 +02:00
Laurent Destailleur
5f9ef61d32 Debug v16 2022-05-19 09:36:47 +02:00
Laurent Destailleur
d38697d74b Missing data in resource module 2022-05-19 08:46:50 +02:00
Laurent Destailleur
6b88655213 Fix num_rows 2022-05-18 23:40:42 +02:00
Laurent Destailleur
8c14f42d60 phpcs 2022-05-18 13:09:17 +02:00
Laurent Destailleur
308e7a3d9b Fix scrutinizer 2022-05-18 12:40:44 +02:00
lmarcouiller
cf2c46b583 Fix : php 8.0 warnings 2022-05-18 12:31:09 +02:00
Laurent Destailleur
48cb30bd9b Fix scrutinizer 2022-05-18 11:34:54 +02:00
Laurent Destailleur
177e8c17fb Fix scrutinizer 2022-05-18 11:23:21 +02:00
Laurent Destailleur
ed2e1bda46 Clean code v16 2022-05-18 11:00:43 +02:00
lmarcouiller
7e4070faa5 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#3 2022-05-18 10:31:56 +02:00
lvessiller
978db41f37 FIX qty received label in Squille PDF model 2022-05-17 15:50:45 +02:00
Laurent Destailleur
4de50da0dd Repare code to forbidden var_dump() into code 2022-05-17 14:55:38 +02:00
lmarcouiller
23da46938a Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#3 2022-05-17 10:15:35 +02:00
Laurent Destailleur
37f7fed003 Maxi debug of export profiles for v16 2022-05-17 00:51:47 +02:00
lmarcouiller
1e406276c5 New : import fields in societe class 2022-05-13 15:04:30 +02:00
Laurent Destailleur
43e7da685b NEW Add more fields to detect duplicate for import of thirdparties 2022-05-12 02:19:31 +02:00
Laurent Destailleur
9ec23c7073 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-05-12 02:02:36 +02:00
Laurent Destailleur
a261b05866
Merge pull request #20825 from Easya-Solutions/fix-incoterms-dictionary-table-name 
FIX dictionary table name in incoterms for Debug v16
 2022-05-12 02:02:20 +02:00
Laurent Destailleur
7f1e8384dc Clean code 2022-05-12 02:02:04 +02:00
lvessiller
aed0296ae2 FIX dictionary table name in incoterms for Debug v16 2022-05-11 11:08:53 +02:00
lvessiller
cdf9b89c0a FIX dictionary table for Debug v16 2022-05-11 10:51:43 +02:00
Laurent Destailleur
3a5fe5063d Debug v16 2022-05-10 16:19:00 +02:00
Laurent Destailleur
fea6771a7a Module Partnership is stable 2022-05-10 15:57:52 +02:00
stickler-ci
98f5edbfba Fixing style errors. 2022-05-10 10:47:18 +00:00
Gauthier PC portable 024
74ba2d551a Merge branch 'NEW/update_on_categorie_product_link_table' of github.com:atm-gauthier/dolibarr into NEW/develop_update_on_categorie_product_link_table 2022-05-10 12:36:49 +02:00
Gauthier PC portable 024
08a3ef5bbf NEW : method avoid being blocked when entry already exists for import in llx_categorie_product (use update keys) 2022-05-10 12:25:38 +02:00
Laurent Destailleur
86b4c97287
Merge branch 'develop' into develop#6 2022-05-10 11:43:27 +02:00
Laurent Destailleur
d0c95d87af Debug v16 2022-05-09 18:59:11 +02:00
Laurent Destailleur
779b75bf65 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/class/bookkeeping.class.php
 2022-05-09 16:53:53 +02:00
Gauthier PC portable 024
60defe4108 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers 2022-05-09 13:29:46 +02:00
Gauthier PC portable 024
5daca35e79 FIX : new tables loading system 2022-05-09 12:33:39 +02:00
Laurent Destailleur
b3b6337c4c
Merge branch 'develop' into NEW_deposit_payment_terms 2022-05-08 23:09:06 +02:00
Laurent Destailleur
30597d7f89
Merge pull request #18163 from FHenry/dev_new_project_upgrade_external_user_perms_project 
NEW: Separate read-only and adding time on projects
 2022-05-08 19:50:46 +02:00
Laurent Destailleur
90c95bc638
Merge pull request #20610 from hregis/fix_missng_signature_library 
FIX missing signature library when ODT model is used
 2022-05-08 19:36:06 +02:00
Laurent Destailleur
f52a7a26f6 Debug v16 - Fix for postgresql - Fix for sql loading per module - php8 2022-05-08 15:18:34 +02:00
Gauthier PC portable 024
2c840e80fb Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers 2022-05-06 11:41:18 +02:00
Florian HENRY
9192596ec3 merge 2022-05-06 11:17:29 +02:00
Florian HENRY
a54c0fb247 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_new_project_upgrade_external_user_perms_project 2022-05-06 11:13:44 +02:00
Laurent Destailleur
f256207cd5 Save logs 2022-05-03 23:54:40 +02:00
Laurent Destailleur
51e9a7c251 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/admin.lang
 2022-05-03 13:05:51 +02:00
Laurent Destailleur
9f379dfcf4 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/core/modules/modCashDesk.class.php
	htdocs/debugbar/class/DataCollector/DolLogsCollector.php
	htdocs/langs/en_US/admin.lang
 2022-05-03 12:17:54 +02:00
Laurent Destailleur
affde55169 FIX deprecated module are not more viewed as external modules 
Trans debugbar
 2022-05-03 12:08:24 +02:00
Laurent Destailleur
6aa32e7c70 Retrograde intracommreport from experimental to dev 2022-05-02 20:21:58 +02:00
Hystepik
0be15e3c74
Merge branch 'develop' into develop#6 2022-05-02 15:16:15 +02:00
lmarcouiller
13e05b875d remove unused files 2022-05-02 15:07:41 +02:00
Laurent Destailleur
21e3a5d5ec Try to fix warnings 2022-05-01 21:04:16 +02:00
Laurent Destailleur
d7398f573c Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-05-01 20:49:43 +02:00
Laurent Destailleur
6308b700d5 # WARNING: head commit changed in the meantime 
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
 2022-05-01 20:47:54 +02:00
Laurent Destailleur
fe2324ac7e
Merge pull request #20669 from ymollard/tickets-collector 
FIX and NEW i18n for creating tickets via the mail collector
 2022-05-01 12:36:16 +02:00
Laurent Destailleur
96519d2a3b
Merge pull request #20758 from ns-info90/develop 
Warehouse pdf generation issue #20632
 2022-05-01 12:16:02 +02:00
Laurent Destailleur
477d681c49 Fix warnings 2022-04-30 17:47:45 +02:00
Laurent Destailleur
7b8e08bbf6 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-04-30 17:28:55 +02:00
stickler-ci
e4d311216a Fixing style errors. 2022-04-30 01:13:45 +00:00
Nicolas SILOBRE
1b0b672892
Warehouse pdf generation issue #20632 
Update of the PDF
Correction of page headers > 1
Added frames
Blackening of texts
Extended footer alignment
 2022-04-30 03:02:22 +02:00
Laurent Destailleur
89d8fdde8d Fix phpcs 2022-04-29 19:31:59 +02:00
Laurent Destailleur
e5aa4afabd
Merge pull request #20683 from hregis/fix_missing_getentity 
FIX compatibility with multicompany sharings
 2022-04-29 18:35:26 +02:00
Laurent Destailleur
3fb081a2fc
Update contacts1.modules.php 2022-04-29 17:57:55 +02:00
Laurent Destailleur
d98637c113
Merge branch 'develop' into cleanMailingLanguageSupport 2022-04-29 17:56:56 +02:00
Laurent Destailleur
801f0e62f7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-04-29 17:37:01 +02:00
Laurent Destailleur
49d15b691b Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/card.php
	htdocs/expensereport/card.php
 2022-04-29 17:35:36 +02:00
Laurent Destailleur
93de425c47 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/accountancy/bookkeeping/card.php
 2022-04-29 17:32:28 +02:00
Laurent Destailleur
17a2aa8f1b Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/modulebuilder/template/class/myobject.class.php
 2022-04-29 17:27:12 +02:00
Laurent Destailleur
6ed0bb2924
Merge pull request #20697 from ns-info90/develop 
Update pdf_rouget.modules.php #20142
 2022-04-29 17:22:40 +02:00
Laurent Destailleur
d496ad65e6 Enhance the feature of keyword detection for partnership 2022-04-29 11:16:15 +02:00
John BOTELLA
900caf5a44 Fix missing budget export 2022-04-28 12:12:20 +02:00
lmarcouiller
8629651659 NEW : module webhook 2022-04-28 11:13:21 +02:00
Florian HENRY
3d4bd1e155 FIX: truncate Customer Reference too long on PDF header (PR #20718) 2022-04-26 16:53:40 +02:00
Florian HENRY
399addfb03 mor docs 2022-04-26 16:40:27 +02:00
Florian HENRY
c00a56bee3 fix: truncate too long Ref Customer in PDF Header 2022-04-26 16:39:06 +02:00
Nicolas SILOBRE
5eb74772d6
Update pdf_rouget.modules.php 
Correction of units in the total weight
 2022-04-23 03:41:17 +02:00
stickler-ci
9fd3a4b2c9 Fixing style errors. 2022-04-22 13:30:43 +00:00
Eric Seigne
72ac1fdfd2 fix #20690: add lang filter for companies 2022-04-22 15:28:48 +02:00
Eric Seigne
d2ec1efb42 fix #20690: add lang filter for people 2022-04-22 15:28:36 +02:00
Regis Houssin
2a5c54d4e4 FIX compatibility for ticket number sharing 2022-04-21 16:02:41 +02:00
Regis Houssin
8878eb6d76 FIX compatibility with multicompany sharings 2022-04-21 14:52:06 +02:00
stickler-ci
aa36e396a3 Fixing style errors. 2022-04-18 22:23:44 +00:00
Yoan Mollard
bf5076e181 set MAIN_EMAILCOLLECTOR_MAIL_WITHOUT_HEADER to TRUE by default 
This is way more readable
 2022-04-19 00:13:40 +02:00
Yoan Mollard
d5361c3147 Improved default signature for tickets 2022-04-19 00:13:40 +02:00
Yoan Mollard
cbdf74e00c i18n the default email collector descriptions 2022-04-19 00:13:40 +02:00
Yoan Mollard
7f27b8c499 Use default e-mail sender/notif/body/signature for tickets if they exist 
Otherwise, when params have not been configured, error message due to an
empty "from e-mail" is unclear
 2022-04-19 00:13:40 +02:00
Gauthier PC portable 024
6faefa7d86 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers 2022-04-12 09:08:57 +02:00
Regis Houssin
2d56aed912 FIX uniformize code 2022-04-12 08:31:51 +02:00
Regis Houssin
c4747735b9 FIX missing signature library when ODT model is used 2022-04-12 07:55:09 +02:00
Laurent Destailleur
40720fad25 Fix php8 compatibility 2022-04-11 02:01:32 +02:00
Laurent Destailleur
ed1bdd26db Rename some jobs 2022-04-07 00:09:11 +02:00
Laurent Destailleur
f9c9e518c3 Load tables for opensurvey only when module opensurvey is enabled 2022-04-05 19:14:00 +02:00
Laurent Destailleur
2e5d0ef92b
Merge pull request #20249 from atm-steve/NEW_Employee_management_improvement 
New employee management improvement #18434
 2022-04-05 15:12:19 +02:00
Laurent Destailleur
2303553fd1
Merge pull request #20392 from thomas-Ngr/develop_fix_ticket_workflow_create_ficheinter_from_public_interface 
Fix: ticket/workflow: automatically create ficheinter
 2022-04-05 15:08:10 +02:00
Laurent Destailleur
3ab993127d NEW Accept 'auto' for ref of object on import of purchase order/proposal 2022-04-05 02:17:01 +02:00
Laurent Destailleur
71012a7933 FIX #19777 #20281 2022-04-04 15:25:29 +02:00
Laurent Destailleur
af45691c9d Clean import profiles 2022-04-04 13:35:08 +02:00
Laurent Destailleur
2690f4459f NEW Enhance the import. Can use 'auto' for the ref (import of orders) 2022-04-04 13:17:45 +02:00
Laurent Destailleur
5960d5971c Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/accounting-files.php
 2022-04-04 10:49:51 +02:00
Laurent Destailleur
2913759bb7 Fix syntax 2022-04-04 10:45:50 +02:00
Thomas Negre
0c0ff4dec9 add WORKFLOW_TICKET_CREATE_INTERVENTION to workflow constants 2022-04-04 09:29:03 +02:00
Laurent Destailleur
f1d5695cb0
Merge pull request #20225 from thomas-Ngr/develop_new_ticket_workflow_auto_link_contract 
NEW: add a workflow to auto link contract on a ticket
 2022-04-02 18:15:27 +02:00
Laurent Destailleur
c4c7b19fbe
Merge pull request #20514 from FHenry/new_hidden_option_in_contractPDF 
NEW add hidden option on contract PDF line to hide qty and price
 2022-04-02 16:29:37 +02:00
Laurent Destailleur
a51c868a8e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
 2022-04-01 14:40:50 +02:00
Laurent Destailleur
d0ee40e55d # WARNING: head commit changed in the meantime 
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
 2022-04-01 14:39:10 +02:00
Laurent Destailleur
6e4ed58be1 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-04-01 14:36:26 +02:00
Laurent Destailleur
a3dbcd0c27 Clean language files 2022-04-01 13:09:11 +02:00
Florian HENRY
cbf89df591 new: add hidden option on contract PDF line 2022-04-01 11:54:16 +02:00
Laurent Destailleur
199faaa6f6
Update modHRM.class.php 2022-03-30 15:19:57 +02:00
atm-steve
4fa656be96
Merge branch 'develop' into NEW_Employee_management_improvement 2022-03-30 12:13:17 +02:00
steve
8f39efd2b9 fix: change Read and Write employee label with personal information 2022-03-30 12:11:07 +02:00
Gauthier PC portable 024
7d3dbf1876 FIX : "WHERE" clause missing on resource export 2022-03-30 11:20:01 +02:00
Laurent Destailleur
636188f28a
Merge pull request #20247 from thomas-Ngr/develop_new_check_invoice_date 
NEW: check invoice date
 2022-03-29 16:07:31 +02:00
Laurent Destailleur
8e7b145510
Update modFacture.class.php 2022-03-29 16:05:41 +02:00
Laurent Destailleur
a80a831ea3 Partnership module swtich from status development to experimental 2022-03-26 12:04:31 +01:00
Marc de Lima Lucio
cbba7d7d5f Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms 2022-03-25 16:14:53 +01:00
Laurent Destailleur
644e509265 Rename "Reconciled" with "BankLineReconciled" for bank conciliation 2022-03-25 14:43:48 +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
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
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
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
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
bf7c707d05 Doc 2022-03-21 11:11:36 +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
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
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
Regis Houssin
b70d3eb8eb FIX uniformize with element name "contact" 2022-03-18 12:05:59 +01:00
lvessiller
566bced9dc FIX escape values and find indexed columns by key 2022-03-18 08:53:54 +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
5d415b183e FIX Option to manage packaging. FIX size/length/volume of reception 2022-03-17 18:53:50 +01:00
Thomas Negre
f92154d057 declare ticket-related constants in modTicket.class.php 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
Laurent Destailleur
49e53abf53 Fix pdf on letter format 2022-03-17 15:01:15 +01:00
lvessiller
254ae943e1 FIX conflicts with develop 2022-03-17 12:33:13 +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
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
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
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
319f21ef69 Fix regression 2022-03-16 16:23:27 +01:00
ATM john
4f395a836e fix crabe multidir output 2022-03-16 12:10:10 +01:00
lvessiller
6d6e6ff70c NEW clean values and amount in FEC import 2022-03-16 10:49:16 +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
Regis Houssin
44b6f8a48d FIX avoid php warning 2022-03-14 09:20:10 +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
Gauthier PC portable 024
9e2c8ffe37 FIX : test for stickler feedback 2022-03-10 11:10:38 +01:00
Gauthier PC portable 024
c103c7d61e Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers 2022-03-10 10:31:56 +01:00
Thomas Negre
6e08115aa2 introduce constant INVOICE_CHECK_POSTERIOR_DATE in Facture module 2022-03-09 09:25:52 +01:00
Laurent Destailleur
2d93c6b678 Fix template 2022-03-08 19:00:21 +01:00
Ferran Marcet
8e944b8b6d Fix: Error whem generating supplier payment pdf 2022-03-08 17:34:51 +01:00
Marc de Lima Lucio
4efcbe8799 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms 2022-03-08 15:23:52 +01:00
Marc de Lima Lucio
1993a8d7b1 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms 2022-03-08 15:07:37 +01:00
Laurent Destailleur
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
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
29e278ed36
Update modCron.class.php 2022-03-07 17:33:50 +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
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
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
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
378dab69a6 FIX #19777 #20281 2022-03-07 13:21:32 +01:00
Ferran Marcet
8c2c3bf3fb Fix: Can't import thirds. Column Skype doesn't exist 2022-03-04 10:06:24 +01:00
steve
436b8fa5b5 apply feedbacks 2022-03-03 16:18:09 +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
Steve
8f07c22d70 Merge branch 'dolibarrdevelop' into WIP_Employee_management_improvement 2022-03-02 14:51:46 +01:00
Laurent Destailleur
5ffac5f3ee Fix typo 2022-03-02 11:38:32 +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
b79ad197ec FIX Missing the field date start/end in export supplier invoice/order 2022-03-01 17:29:22 +01:00
Steve
5bf186c8ce Merge branch 'dolibarrdevelop' into WIP_Employee_management_improvement 2022-03-01 11:42:57 +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
67881a7932
Merge branch 'develop' into 16a12_assets_code 2022-02-28 22:03:26 +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
steve
08fa2dfadd wip: add read employee and write employee 2022-02-28 15:58:23 +01:00
Francis Appels
3e41c9cb97 FIX: Show product photo on Supplier order Cornas model. 2022-02-26 11:13:02 +01:00
Laurent Destailleur
e96061dd18 Fix phpunit SecurityTest 2022-02-22 23:46:57 +01:00
Laurent Destailleur
c63e2c2981 Website tables are created only if module enabled. 2022-02-22 19:15:37 +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
Thomas Negre
ad3f7b531e add constants declarations in the module class 2022-02-21 11:50:28 +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
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
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
e41e0f069a Fix creator in PDF. Add log to help to find strange bug 2022-02-18 15:09:52 +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
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
c20d824999 Tables of module ticket are create only when module is enabled. 2022-02-17 19:30:18 +01:00
Laurent Destailleur
c16e013b99 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
	htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
 2022-02-16 21:13:49 +01:00
Alexandre SPANGARO
948f20c2b6 Add a graphical option to define duration per year for depreciation 2022-02-16 05:18:29 +01:00
atm-greg
96c7a9f77c fix pdf_cornas 2022-02-14 15:16:36 +01:00
atm-greg
3ebdb89133 fix pdf_mucadet 2022-02-14 15:11:26 +01:00
Alexandre SPANGARO
6734a3575e Core 2022-02-14 04:52:39 +01:00
Laurent Destailleur
52bacbd914 Tables for emailing and asset modules are loaded on module activation 2022-02-10 19:21:15 +01:00
Thomas Negre
4c5ddcf030 ticket config: add constant TICKET_AUTO_READ_WHEN_CREATED_FROM_BACKEND to admin panel 2022-02-10 17:57:28 +01:00
Laurent Destailleur
d69f9eca40 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/pdf.lib.php
 2022-02-10 11:25:15 +01:00
Adrien Raze
194959c61c FIX : Fixing PR returns 2022-02-09 10:03:30 +01:00
Christian Foellmann
e0a3820b9c fix double VAT line in commande PDF template 2022-02-09 08:01:24 +01:00
Adrien Raze
ee52cac3ba NEW : Template supplier invoices 2022-02-07 14:34:27 +01:00
Laurent Destailleur
bd3218b460 Fix remove dead code 2022-02-06 13:06:12 +01:00
Laurent Destailleur
1ca1f111b3 Fix warnings 2022-02-01 16:12:51 +01:00
Laurent Destailleur
6ddc4ba3a0 Fix bad value for total VAT on PDF 2022-02-01 13:23:52 +01:00
Laurent Destailleur
d167e022eb Debug v15 2022-01-31 12:08:51 +01:00
Laurent Destailleur
d75dd51bb7 Clean code to debug fulldayevent 2022-01-29 00:39:20 +01:00
Francis Appels
8d75f575e5 Fix missing reception module description translation key. 2022-01-28 16:35:14 +01:00
Laurent Destailleur
ef70777cf1 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/reception/card.php
 2022-01-28 15:57:09 +01:00
Laurent Destailleur
60fff852ab Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-01-26 12:53:06 +01:00
Laurent Destailleur
0ee0bfed85 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/fourn/commande/card.php
	test/phpunit/testvirus.txt
 2022-01-23 13:04:37 +01:00
Laurent Destailleur
e0956c1765 Fix missing token, missing reposition, missing modulepart 2022-01-22 15:33:47 +01:00
Laurent Destailleur
14af64d143 NEW Can removed doc templates from setup page of thirdparty 2022-01-22 15:09:14 +01:00
Laurent Destailleur
284fcf3ad5 FIX Company logo not found in some cases on some templates 2022-01-22 13:19:29 +01:00
Laurent Destailleur
1dcfb88ad4 Debug v15 2022-01-21 13:44:40 +01:00
Laurent Destailleur
744296a43a FIX Permission on holiday and expensereport. 2022-01-14 13:52:08 +01:00
Laurent Destailleur
13510b9929 Clean sortfield, sortorder 2022-01-13 11:17:25 +01:00
Laurent Destailleur
c3a42162d9 FIX The vat code was not correctly managed on PDF templates 2022-01-08 14:43:24 +01:00
Laurent Destailleur
60b2479389 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/list.php
 2022-01-07 16:00:19 +01:00
Laurent Destailleur
7618966f81 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/comm/action/list.php
	htdocs/core/class/utils.class.php
	htdocs/install/mysql/data/llx_20_c_departements.sql
 2022-01-07 15:56:21 +01:00
Laurent Destailleur
132d393d23 Code comment 2022-01-06 16:06:17 +01:00
Laurent Destailleur
d9715729c8 Fix var 2022-01-05 22:44:12 +01:00
Laurent Destailleur
0189d92139 Some country need qr code for legal issues. Add a hook to allow this. 2022-01-04 20:44:17 +01:00
Laurent Destailleur
1d80b8394a Debug v15 2022-01-04 12:56:08 +01:00
Laurent Destailleur
f8a97ef928 FIX a lot of problem with rules for password validation 2022-01-03 16:09:08 +01:00
Ferran Marcet
ff2388ceaf Fix: correctly display the products of a warehouse in the pdf 2022-01-03 13:08:20 +01:00
Laurent Destailleur
cecb11bb1c Debug v15 2022-01-03 12:28:42 +01:00
Laurent Destailleur
72998cd8fe Debug v15 2022-01-03 12:26:57 +01:00
Laurent Destailleur
f7871be6cd Debug v15 2022-01-03 03:06:18 +01:00
Laurent Destailleur
0037ee2254 Fix ckeditor plugins 2022-01-01 19:37:53 +01:00
Laurent Destailleur
9c50cfeb62 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/modBom.class.php
	htdocs/core/modules/modCommande.class.php
	htdocs/core/modules/modFournisseur.class.php
	htdocs/core/modules/modPropale.class.php
 2021-12-30 19:18:41 +01:00
Laurent Destailleur
809c8f993b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/modules/modCommande.class.php
	htdocs/core/modules/modFournisseur.class.php
	htdocs/core/modules/modPropale.class.php
	htdocs/filefunc.inc.php
	htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php
 2021-12-30 19:03:46 +01:00
Laurent Destailleur
108df3726a Fix php syntax 2021-12-30 18:46:26 +01:00
Laurent Destailleur
62a74ed428 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php
	htdocs/societe/list.php
 2021-12-30 17:57:45 +01:00
Laurent Destailleur
ebb7aa7494
Merge pull request #19693 from grandoc/new_branch_27_12_2021 
fix : units were not displayed
 2021-12-30 13:19:25 +01:00
John BOTELLA
0f587a37e2 fix missing var definition 2021-12-28 19:36:44 +01:00
Philippe GRAND
f8884d2c86 fix : units were not displayed 2021-12-27 15:00:05 +01:00
Laurent Destailleur
2de5db83a9 Fix iban_prefix 2021-12-21 14:51:57 +01:00