Commit Graph

95944 Commits

Author SHA1 Message Date
Laurent Destailleur
d00a4baeab
Merge pull request #20687 from fred1201/fred01dev
Fix display in take post  when special caracter are store in database
2022-04-29 18:02:49 +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
fdfde165a9 FIX #20702 #20699 #20700 2022-04-29 17:48:40 +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
BENKE Charlene
364799582a fix : allow cut&paste as real numeric value to excel 2022-04-29 17:24:55 +02:00
Laurent Destailleur
235edb1f70
Merge pull request #20709 from defrance/patch-183
NEW: allow cut&paste as real numeric value to excel
2022-04-29 17:23:56 +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
a6f48868f1
Merge pull request #20689 from atm-gauthier/FIX/trad_expense_tax_cat_label
FIX : label tax cat trad
2022-04-29 17:22:15 +02:00
Laurent Destailleur
b4f6cbc64a
Merge pull request #20706 from fappels/develop_fix_migration
Fix migration warning.
2022-04-29 17:21:52 +02:00
Laurent Destailleur
fa8ce6e4fd
Merge pull request #20710 from fappels/develop_confirm_createbills
Move massaction 'confirm_createbills' from actions_massactions.inc.php to commande/list.php
2022-04-29 17:19:18 +02:00
Laurent Destailleur
38c0264971 Show warning if not journal not defined 2022-04-29 17:15:42 +02:00
Laurent Destailleur
7a440d8c73
Merge pull request #20713 from daraelmin/daraelmin-bookkeping-create-mode
Fix #20712 - No more empty wrong line added in bookkeeping confirme_create
2022-04-29 17:08:49 +02:00
Laurent Destailleur
e1aaeeef29 FIX #20140 #20301 2022-04-29 16:57:23 +02:00
matll42
ff35bf8d47 FIX #20476 migration postgresql 14.0.x to 15.0.x packaging type 2022-04-29 16:53:48 +02:00
Laurent Destailleur
80dce10473
Merge pull request #20714 from matll42/fix/postgresql_upgrade_15_0_1_packaging_real
FIX #20476 migration postgresql 14.0.x to 15.0.x packaging type
2022-04-29 16:52:30 +02:00
Laurent Destailleur
f06af016cd
Merge pull request #20720 from aspangaro/16a24
FIX Accountancy - Export format FEC - Prevent tabbing in label with the formats for which it is the separator
2022-04-29 16:50:51 +02:00
Laurent Destailleur
8f7239c239
Merge pull request #20723 from dolibarr95/patch-62
NEW : Send email to the supplier order contact
2022-04-29 16:49:09 +02:00
Laurent Destailleur
bc03658f18 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2022-04-29 16:42:43 +02:00
Laurent Destailleur
67048cd2c6
Merge pull request #20721 from altairisfr/getsellprice
NEW : add hook to getSellPrice function
2022-04-29 16:39:30 +02:00
Laurent Destailleur
7b509706b6
Merge pull request #20722 from dolibarr95/patch-61
NEW: Add option to foce delivery on email for purchase order receipt to yes
2022-04-29 16:37:58 +02:00
Laurent Destailleur
9729918101
Merge pull request #20728 from aspangaro/16a25
NEW Accountancy - Product admin - Add product categories
2022-04-29 16:36:34 +02:00
Laurent Destailleur
fbfb003c9b
Merge pull request #20731 from altairisfr/fixtakepos
FIX TakePos - fix select fields
2022-04-29 16:30:20 +02:00
Laurent Destailleur
9e23b30728 Fix remove useless file 2022-04-29 16:22:04 +02:00
Laurent Destailleur
4a8864ed63
Merge pull request #20739 from lainwir3d/inventories_fix_movement_display
FIX #20738 Inventory: Add missing <td....> for movement number / card.
2022-04-29 16:06:07 +02:00
Laurent Destailleur
5817c1f1b7
Update inventory.php 2022-04-29 16:05:52 +02:00
Laurent Destailleur
659f520365
Merge pull request #20740 from inovea-conseil/event_propal_return_to_draft
NEW Events on Proposal to Return to Draft
2022-04-29 16:04:26 +02:00
Laurent Destailleur
3dd90ecf41 js escape 2022-04-29 16:02:05 +02:00
Laurent Destailleur
cc55b4444f
Merge pull request #20746 from altairisfr/pagin
NEW TakePos - pagination on search results
2022-04-29 15:59:50 +02:00
Laurent Destailleur
223db9bb76 Fix: Not SetEventMessages inside a CRUD class. 2022-04-29 14:32:47 +02:00
Laurent Destailleur
921aabfc54 Look and feel v16 2022-04-29 14:11:38 +02:00
Laurent Destailleur
8ad57b3d7a Fix td 2022-04-29 13:43:51 +02:00
Laurent Destailleur
fed14db94a css 2022-04-29 13:22:46 +02:00
Laurent Destailleur
3780e83615 Trans 2022-04-29 13:20:14 +02:00
Laurent Destailleur
147e61472c Clean code: Remove all &ensp; entities. 2022-04-29 13:10:28 +02:00
Laurent Destailleur
708d3610a5 Look and feel v16 2022-04-29 13:04:29 +02:00
Laurent Destailleur
bdd9b2acf4 Clean css 2022-04-29 12:36:38 +02:00
Laurent Destailleur
d496ad65e6 Enhance the feature of keyword detection for partnership 2022-04-29 11:16:15 +02:00
Christophe Battarel
d682cb3103 please Travis 2022-04-29 11:09:32 +02:00
Christophe Battarel
812b9adee7 still trying to please Travis... losing my time 2022-04-29 10:58:04 +02:00
Quentin-Seekness
726b899d30
FIX: Delete an extrafield where type is double
Found the bug on a propal's extrafield, it was impossible to delete a decimal extrafield.  In updateExtraField() the $value stayed "" where it needed to be null.
The same issue can be found in insertExtraFields().
2022-04-29 10:45:08 +02:00
Christophe Battarel
a11b5b4399 escape sql string for my Travais friend 2022-04-29 10:12:53 +02:00
Christophe Battarel
fb076a9282 FIX pagination on search results 2022-04-29 10:00:25 +02:00
Christophe Battarel
78f46bb98b search next or previous page of products if asked 2022-04-29 09:49:10 +02:00
Christophe Battarel
accb900d4f ajax load only one page of search results 2022-04-29 09:45:36 +02:00
Laurent Destailleur
822a0a37f3 Fix phpunit 2022-04-28 22:37:21 +02:00
Laurent Destailleur
a129b6d132 FIX phpcs 2022-04-28 22:29:48 +02:00
Laurent Destailleur
40d0c3b996 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/tva/card.php
	htdocs/langs/en_US/admin.lang
2022-04-28 19:23:13 +02:00