Commit Graph

11212 Commits

Author SHA1 Message Date
stickler-ci
a8752bf097 Fixing style errors. 2021-07-11 07:46:34 +00:00
fr69400
c7ad0a59c9
Update note.php 2021-07-11 09:45:38 +02:00
stickler-ci
4272f93aa4 Fixing style errors. 2021-07-09 16:41:41 +00:00
fr69400
e45d5c1d0d NEW add hookmanager on note pages 2021-07-09 18:36:21 +02:00
Laurent Destailleur
6cb5ea6ec2 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-06-30 17:27:20 +02:00
Laurent Destailleur
bda36337cd Prepare fix #yogosha6443 2021-06-30 17:22:36 +02:00
Laurent Destailleur
7c2121c439 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/tpl/objectline_edit.tpl.php
2021-06-30 15:06:16 +02:00
Laurent Destailleur
51456741d9 FIX Can't edit replacement invoice
FIX Status of invoice when making a replacement invoice
2021-06-30 12:43:44 +02:00
Laurent Destailleur
02a5755876 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/langs/nl_NL/main.lang
2021-06-29 19:59:51 +02:00
Laurent Destailleur
04148dd5fb
Merge pull request #17789 from aspangaro/14b10
NEW Add field date from/to in customer payment list
2021-06-29 19:54:12 +02:00
Laurent Destailleur
56787bc292
Update card.php 2021-06-29 19:14:03 +02:00
Francis Appels
1b7b45d72a Merge remote-tracking branch 'Dolibarr/14.0' into 14_fix_php8_part2 2021-06-29 16:56:48 +02:00
Francis Appels
e4f61d430f Invoice php 8 issue and warnings.
Seems if ("" < 0) is true in php 8
2021-06-29 16:33:24 +02:00
Laurent Destailleur
d788e58f67
Merge pull request #18036 from frederic34/codesample
remove unused code
2021-06-29 15:47:03 +02:00
lmarcouiller
923a015aac Fix #18014 : update of compta/facture/card.php 2021-06-28 11:38:34 +02:00
Frédéric FRANCE
58701bef5d
remove unused code 2021-06-26 21:10:59 +02:00
Laurent Destailleur
67e7556f70
Merge pull request #18032 from OPEN-DSI/new-invoice-create-from-clone-errors
NEW get errors on create invoice from clone
2021-06-26 11:53:45 +02:00
Laurent Destailleur
bc816f253c Fix tooltip 2021-06-26 02:07:18 +02:00
Laurent Destailleur
12d591b848 css 2021-06-26 00:18:46 +02:00
Laurent Destailleur
ccffb36a37 CSS 2021-06-26 00:14:53 +02:00
Laurent Destailleur
6e3647af2c Debug v14 2021-06-26 00:08:19 +02:00
Laurent Destailleur
d2485033d7 Fix deletion of template invoice 2021-06-25 23:10:42 +02:00
lvessiller
24acc82ca6 NEW get errors on create invoice from clone 2021-06-25 16:40:39 +02:00
Laurent Destailleur
a657fe2fca Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-06-23 13:31:40 +02:00
Laurent Destailleur
6db44e66d6 FIX #18006 2021-06-23 13:30:00 +02:00
Laurent Destailleur
acce226c05 Debug cash fence feature (missing report per vat rate) 2021-06-23 13:00:50 +02:00
Laurent Destailleur
11a71d8d2f Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
2021-06-23 11:41:30 +02:00
Laurent Destailleur
034906a129 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
	htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
2021-06-23 11:30:44 +02:00
Laurent Destailleur
c9d4ccd40a
Merge pull request #17845 from atm-gauthier/fix_libstatus_invoice_in_linked_objects_block
FIX : need to add payment sum to getlibstatus function in object linked block (bug still exists in 13.0)
2021-06-23 10:48:22 +02:00
Laurent Destailleur
56212508e7
Update linkedobjectblock.tpl.php 2021-06-23 10:47:23 +02:00
Laurent Destailleur
68b8a6a916 css 2021-06-20 16:35:49 +02:00
Laurent Destailleur
7046791377 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-06-19 14:16:39 +02:00
Laurent Destailleur
53295a0cb1 Fix phpcs 2021-06-18 01:06:28 +02:00
Laurent Destailleur
88ff0e4795 Fix PHPCS 2021-06-18 00:59:18 +02:00
Laurent Destailleur
834fc289b6 Fix look and feel v14 2021-06-16 20:35:55 +02:00
Frédéric FRANCE
cf9c595568
fix unknown right
supprimer doesn't exists
2021-06-16 12:01:52 +02:00
Laurent Destailleur
adfbb9d7d5 Fix VAT column missing 2021-06-15 17:53:25 +02:00
Gauthier PC portable 024
564a3b66c2 FIX : method exists 2021-06-14 17:08:16 +02:00
Scrutinizer Auto-Fixer
55c9f37ffa Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2021-06-14 13:37:02 +00:00
Laurent Destailleur
3cacad795f Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-06-14 14:26:07 +02:00
Laurent Destailleur
5cc86d2319 Fix #yogosha6370 2021-06-14 13:51:09 +02:00
Laurent Destailleur
046215f64a Fix PHP8 2021-06-14 02:08:28 +02:00
Laurent Destailleur
aceeb9558f css 2021-06-14 01:13:46 +02:00
Laurent Destailleur
34cebe6aa3 Look and feel v14 2021-06-14 01:11:39 +02:00
Frédéric FRANCE
791e4ab056
fix warning 2021-06-13 15:59:22 +02:00
Laurent Destailleur
a8401ca30d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-06-12 15:47:18 +02:00
Laurent Destailleur
f13dcb5376 Fix merge 2021-06-12 15:44:03 +02:00
Laurent Destailleur
306b7779ff
Merge branch 'develop' into 11p1 2021-06-11 19:55:37 +02:00
Laurent Destailleur
dd1f49b4b0
Merge pull request #17794 from atm-quentin/FIX_jointure_cabyprod
Fix jointure cabyprod
2021-06-11 19:12:29 +02:00
Laurent Destailleur
756786f717 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/compta/facture/list.php
	htdocs/core/class/discount.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/lib/pdf.lib.php
	htdocs/core/modules/modFournisseur.class.php
	htdocs/fourn/facture/card.php
	htdocs/holiday/list.php
	htdocs/paybox/admin/paybox.php
	htdocs/paypal/admin/paypal.php
	htdocs/product/price.php
	htdocs/projet/activity/perday.php
	htdocs/projet/activity/permonth.php
	htdocs/projet/activity/perweek.php
	htdocs/stripe/admin/stripe.php
2021-06-11 19:05:05 +02:00