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

112767 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
c529af90c6 Fix trans 2022-02-17 12:06:48 +01:00
Laurent Destailleur
3697cb9ca4 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/reception/class/reception.class.php
 2022-02-17 11:34:54 +01:00
Henry
bb08341dc3
to disable the default pdf generation 2022-02-17 18:34:23 +08:00
Laurent Destailleur
67cb268324 Update example conf file with force_install_lockinstall 2022-02-17 11:33:34 +01:00
stickler-ci
7e6a5d5792 Fixing style errors. 2022-02-17 10:13:30 +00:00
Thomas Negre
1ad8700810 empty commit to force travis try rebuild 2022-02-17 11:08:23 +01:00
atm-lena
c2bc3b20bb Don't display collapse if no bom on bomline 2022-02-17 11:05:03 +01:00
stickler-ci
13cfe858f2 Fixing style errors. 2022-02-17 09:53:02 +00:00
Adrien Raze
f16567a44a Merge branch 'develop' of github.com:Dolibarr/dolibarr into FIX_total_cost_for_sub_bom 2022-02-17 10:45:19 +01:00
lmarcouiller
aea9c2e427 Fix : fix php 8.0 warnings 2022-02-17 10:22:58 +01:00
Atm-Gregr
8d14d18638 Merge branch '15.0' of github.com:Dolibarr/dolibarr into FIX_VacantPosition 2022-02-17 09:59:36 +01:00
Thomas Negre
1c8c98ac0f fix ticket public interface: 
When sending an email to the customer,
If a custom URL had been provided for ticket public interface,
the link provided in the email did lead to the index of the public interface.
We want it to lead to /view.php
 2022-02-17 09:53:36 +01:00
Alexandre SPANGARO
96fcd7cae2 Fix travis 2022-02-17 05:41:37 +01:00
Alexandre SPANGARO
33af0eb0fb Fix travis 2022-02-17 05:21:48 +01:00
Alexandre SPANGARO
0f51fadf38
Merge branch 'develop' into 16a12_assets_code 2022-02-17 04:15:03 +01:00
Alexandre SPANGARO
ccbbc98f7a Fix travis 2022-02-17 04:13:02 +01:00
Laurent Destailleur
626a5b90f1 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-02-16 21:23:45 +01:00
Laurent Destailleur
c3733a92e1 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.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:22:49 +01:00
Laurent Destailleur
eb8caf7419 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2022-02-16 21:17:19 +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
Laurent Destailleur
92cb95a184
Merge pull request #20064 from ATM-Consulting/FIX_uniformize_pdf_logo_behaviour 
Fix uniformize pdf logo behaviour for supplier orders
 2022-02-16 21:09:45 +01:00
Laurent Destailleur
131ae92cc6 FIX #20063 2022-02-16 21:05:23 +01:00
lvessiller
9b1d800311 NEW add triiger and event on totally received status 2022-02-16 20:52:01 +01:00
lvessiller
690a91d546 NEW automatically set totally received status in reception 2022-02-16 20:51:47 +01:00
Laurent Destailleur
dfcc49d466 Doc 2022-02-16 20:50:27 +01:00
Laurent Destailleur
67168ffb16
Merge pull request #20065 from Easya-Solutions/new-reception-all-products 
NEW automatically set totally received status in reception
 2022-02-16 20:48:50 +01:00
Laurent Destailleur
ea4eed31f5
Merge pull request #20066 from javieralapps4up/develop 
FIX Andorra needs Code Banque
 2022-02-16 20:38:26 +01:00
Laurent Destailleur
a7fab01059
Merge pull request #20069 from vincentjdc/expensse-report-download-fix 
Fixes expensereport downloads
 2022-02-16 20:37:32 +01:00
Laurent Destailleur
5cf8fae151
Merge pull request #20072 from fappels/15_fix_barcode_viewimage 
Fix barcode viewimage regression on yogosha8628
 2022-02-16 20:36:59 +01:00
Laurent Destailleur
cebada1966
Merge pull request #20071 from frederic34/patch-1 
NEW Hook getNomUrl available everywhere in tooltip of ref links
 2022-02-16 20:36:02 +01:00
Laurent Destailleur
ed10db668d
Merge pull request #20073 from atm-quentin/FIX_13_combinations 
FIX weight is lost if it's comma on combinations card
 2022-02-16 20:34:24 +01:00
Laurent Destailleur
73e2b13418 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-02-16 20:32:30 +01:00
Laurent Destailleur
2a18bce2f3 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/api/index.php
	htdocs/langs/en_US/productbatch.lang
	htdocs/langs/fr_FR/productbatch.lang
	htdocs/ticket/list.php
 2022-02-16 20:31:55 +01:00
Laurent Destailleur
906651d404 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-02-16 20:27:26 +01:00
Laurent Destailleur
e0563d2bef Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-02-16 20:27:07 +01:00
Laurent Destailleur
7029bb7000
Merge pull request #20077 from AlexisLaurier/bugfix/paymentByBankTransfertIndexTabEntity 
add missing entity check on list of withdraws on index of paymentbyba…
 2022-02-16 20:26:39 +01:00
Laurent Destailleur
aad292b41b
Merge pull request #20074 from altairisfr/fix_parentline_13.0 
More generic management of parentline
 2022-02-16 20:25:04 +01:00
Laurent Destailleur
a33ca21151
Merge pull request #20079 from AlexisLaurier/bugfix/fixPrelevmentLineDetails-ForBankPaymentTransfert 
manage details of prelevment line for bank transfer
 2022-02-16 20:22:54 +01:00
Laurent Destailleur
ab2d3460d7
Merge pull request #20080 from Easya-Solutions/new-total-mark-rate-in-list 
NEW total mark rate in list
 2022-02-16 20:22:15 +01:00
Laurent Destailleur
645bf9564e
Merge pull request #20084 from altairis-noe/stock_doc14 
FIX: correct warehouse document location
 2022-02-16 20:18:43 +01:00
Laurent Destailleur
357f6e234a
Merge pull request #20086 from altairis-noe/duplicate_serial_move_trans 
FIX : translation string instead of error message text
 2022-02-16 20:18:01 +01:00
Laurent Destailleur
b3d71b2a12
Merge pull request #20087 from ATM-Consulting/FIX_job_card_button_add_event 
FIX : HRM | Change button and add title on job card
 2022-02-16 20:17:10 +01:00
Laurent Destailleur
36c04a7b82
Merge pull request #20088 from Hystepik/develop#3 
Fix : fix warnings php 8.0 on modulebuilder
 2022-02-16 20:16:27 +01:00
Laurent Destailleur
190d8d6143
Merge pull request #19076 from inovea-conseil/FIX_ISSUE_DB_ERROR_SYNTAX-#18921 
FIX ISSUE DB_ERROR_SYNTAX #18921
 2022-02-16 20:15:25 +01:00
Laurent Destailleur
e1bf1a54f7
Merge pull request #20089 from thomas-Ngr/14_fix_ticket_return_list_db_error_syntax 
fix: ticket return list creates db error syntax
 2022-02-16 20:14:27 +01:00
Alexandre SPANGARO
453449324e Fix travis 2022-02-16 18:09:32 +01:00
Laurent Destailleur
1ede8a30b2 Missing NOSESSION 2022-02-16 17:49:05 +01:00
Florian
aa2a57ff95 Check that the value is not an array 2022-02-16 17:00:54 +01:00
Florian
7ed6ca6ec6 FIX ISSUE DB_ERROR_SYNTAX-#18921 2022-02-16 17:00:50 +01:00
lmarcouiller
a9496220b5 Fix : warnings php 8.0 2022-02-16 16:43:52 +01:00