lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
94,717 Commits 43 Branches 150 Tags 886 MiB
efd44b0ec0
Commit Graph

94717 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
efd44b0ec0 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-10-07 10:57:03 +02:00
Laurent Destailleur
5910d10021 Add hidden option to allow to fix corrupted situations 2021-10-07 10:43:50 +02:00
Laurent Destailleur
e3032ef1c4 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/fourn/facture/card.php
 2021-10-06 16:06:25 +02:00
Laurent Destailleur
eba377cdf0
Merge pull request #18860 from FHenry/12_fix_selectline_from_supplier_order_to_supplier_invoice 
fix: Supplier order => Supplier Invoice : line selector (checkbox) wasn't working
 2021-10-06 15:31:14 +02:00
Laurent Destailleur
10f0434116
Update card.php 2021-10-06 15:30:19 +02:00
Laurent Destailleur
1c56f65c27 Fix missing migration instruction 2021-10-04 11:49:49 +02:00
Laurent Destailleur
157112758b Fix phpcs 2021-09-30 20:14:59 +02:00
Florian HENRY
6d00097c89 fix 2021-09-30 16:37:52 +02:00
Laurent Destailleur
44bb5ebf34 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
 2021-09-30 16:23:34 +02:00
Laurent Destailleur
bb6399e12a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/admin/dict.php
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/product/card.php
 2021-09-30 16:21:36 +02:00
Laurent Destailleur
fc4a16b356 Fix avoid error when trigger run on downgraded version. 2021-09-30 16:18:07 +02:00
Florian HENRY
d0508d557b fix: checkbox for line selection between supplier order and supplier invoice was infective 2021-09-30 14:56:02 +02:00
Laurent Destailleur
422191def1
Merge pull request #18858 from FHenry/12_fix_dict_tva 
fix: search code on tva dict
 2021-09-30 14:05:07 +02:00
Laurent Destailleur
620d7109b5
Update dict.php 2021-09-30 14:04:56 +02:00
Florian HENRY
332fa77d90 fix: search code on tva dict 2021-09-30 13:49:02 +02:00
Laurent Destailleur
c3d539abff
Merge pull request #18833 from marc-dll/12.0_FIX_product_extrafields_update 
FIX: products/services card: hidden extrafields were overridden
 2021-09-28 12:13:08 +02:00
Marc de Lima Lucio
6abe6462e6 FIX: products/services card: hidden extrafields were overridden 2021-09-27 14:33:57 +02:00
Laurent Destailleur
a3c8f2ed56
Merge pull request #18771 from laudeco/hotfix/receipt_html 
Allow to edit the header of receipt by using HTML
 2021-09-24 13:33:08 +02:00
Laurent De Coninck
70e66627fe
restrict the html 2021-09-22 20:14:47 +02:00
Laurent De Coninck
5e2d8eac2b
Allow to edit the header of receipt by using HTML 
In the current version the WYSIWYG oesn't allow any HTML by thus fix you
can use any button from the wysiwyg and it displays on the receipe.

[see: X]
 2021-09-20 22:51:43 +02:00
Laurent Destailleur
b546f21ef4 Merge branch '12.0' of https://github.com/dolibarr/dolibarr into 13.0 
Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
 2021-09-17 12:21:25 +02:00
Laurent Destailleur
505517d142
Merge pull request #18629 from Gjuju/12.0 
Fix : GET extrafields on API "get events list" requests
 2021-09-17 12:16:32 +02:00
Laurent Destailleur
c04604ea1c
Merge pull request #18721 from fmarcet/13.0 
Fix: On payment list, not filter by company when it is an external user
 2021-09-17 11:48:54 +02:00
Laurent Destailleur
1c43a83a8b
Merge pull request #18737 from marc-dll/12.0_FIX_projet_task_time_user_filter 
FIX: task time: can't filter by user with pgsql + show error message
 2021-09-17 11:31:45 +02:00
Marc de Lima Lucio
571d130c3c FIX: task time: keep on using natural_search 2021-09-17 10:51:37 +02:00
Laurent Destailleur
3a8a813c4e
Merge pull request #18730 from esion-net/patch-2 
NEW Expose bank account holder, label and number
 2021-09-17 10:50:11 +02:00
Marc de Lima Lucio
88cd8fface FIX: task time: can't filter by user with pgsql + show error message 2021-09-16 17:53:47 +02:00
Florian
3091448d1a
Expose bank account holder, label and number 
Useful for automated texts on invoices to have those values available as well.
 2021-09-16 15:40:25 +02:00
Laurent Destailleur
c68687bdf6 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/product/fournisseurs.php
 2021-09-16 13:29:25 +02:00
Laurent Destailleur
87bb971d75 FIX autocalculation of the supplier price in main currency. 
Conflicts:
	htdocs/product/fournisseurs.php
 2021-09-16 13:22:22 +02:00
Laurent Destailleur
599621cc1b Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-09-15 13:29:55 +02:00
Laurent Destailleur
724badb522 Fix deletion of shipment when there is batch record 2021-09-15 13:29:19 +02:00
Ferran Marcet
7a637104b2 Fix: Not filter by company when it is an external user 2021-09-15 11:29:12 +02:00
Julien Gainza
65c4a21898 FIX move fetch_optionnal into $ac_static->fetch() 2021-09-13 16:35:13 +02:00
Juanjo Menent
1eb4975a76 fix: Bad date creation for project clone 2021-09-10 11:44:58 +02:00
Laurent Destailleur
77247ec43a Add date valid/approval 2021-09-09 20:35:57 +02:00
Laurent Destailleur
f4786c8a0a Include ref into label of log history 
Conflicts:
	htdocs/holiday/card.php
 2021-09-09 19:50:39 +02:00
Laurent Destailleur
30894b989c Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-09-09 15:12:16 +02:00
Laurent Destailleur
70f22f2648 # WARNING: head commit changed in the meantime 
Merge
 2021-09-09 15:12:02 +02:00
Laurent Destailleur
1a8364adcc
Merge pull request #18637 from hregis/fix_multicompany 
FIX multicompany transverse mode compatibility
 2021-09-09 14:50:22 +02:00
Regis Houssin
303b0e7f31 FIX better sql request 2021-09-09 09:21:30 +02:00
Laurent Destailleur
e20e80fae3
Merge pull request #18646 from ksar-ksar/patch-8 
FIX #18591 : Remove double quotes of SQL Queries
 2021-09-09 04:36:48 +02:00
Regis Houssin
8c95ada9fd FIX wrong users count in multicompany transverse mode 2021-09-08 10:25:27 +02:00
ksar
e26e6288c2
FIX #18591 : Remove double quotes of SQL Queries 
FIX #18591 : Remove double quotes of SQL Queries for postgresql compatibility
 2021-09-07 15:22:02 +02:00
Regis Houssin
52419f28c5 FIX add DISTINCT 2021-09-07 12:38:15 +02:00
Regis Houssin
4aaaa8e21a FIX multicompany transverse mode compatibility 2021-09-07 12:10:35 +02:00
Julien Gainza
9d89e48d15 Fix : Add extrafields on API "get events list" 2021-09-06 15:55:33 +02:00
Laurent Destailleur
68bc85124b
Merge pull request #18601 from frederic34/patch-8 
fix #17634
 2021-09-05 01:07:46 +02:00
Frédéric FRANCE
456f25d57e
fix #17634 2021-09-04 11:30:03 +02:00
Laurent Destailleur
82d878dd7a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
 2021-09-01 17:59:07 +02:00