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
108,311 Commits 35 Branches 179 Tags 1.7 GiB
d00a4baeab
Commit Graph

6288 Commits

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