Commit Graph

2841 Commits

Author SHA1 Message Date
Laurent Destailleur
c6cb29381e Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-05-11 19:09:19 +02:00
Laurent Destailleur
5dd3f57a1e Debug v18 2023-05-11 13:11:21 +02:00
Laurent Destailleur
9674d234ba FIX On company change, we must reuse the company parameters 2023-05-10 22:05:43 +02:00
Laurent Destailleur
2d784f3008 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-05-10 05:01:15 +02:00
Florian HENRY
77e52007e4 fix: add field in sql the is use in line 1463 and remove undeclare varible 2023-05-05 19:09:28 +02:00
stickler-ci
13348ede59 Fixing style errors. 2023-05-05 16:22:49 +00:00
NextGestion
e8acd50626 Object line : Prevent adding Free line when the option "MAIN_DISABLE_FREE_LINES" is activated (Proposal, invoice, order, contract) 2023-05-05 17:15:49 +01:00
Laurent Destailleur
91f5971b01 Fix alignment 2023-05-01 18:46:22 +02:00
Laurent Destailleur
72f96cc16c
Merge pull request #24437 from FliyFly/editpropalattributes
Edit attributes on propal card
2023-05-01 18:15:06 +02:00
Laurent Destailleur
4028b5d568 Clean code 2023-04-29 13:13:12 +02:00
Laurent Destailleur
be835d63ed
Merge pull request #24635 from VMR-Global-Solutions/develop
API add / fix filter on extrafields in index()
2023-04-28 20:02:09 +02:00
Laurent Destailleur
e74c50aa8a Clean code 2023-04-28 16:05:25 +02:00
VMR Global Solutions
926aa6fec7
API add / fix filter on extrafields in index()
Add / change in api_xxx.class.php files the ability to filter on extrafields when missing in the public functions index()
by changing the SQL query with the pattern 
" FROM ".MAIN_DB_PREFIX"xxxx AS t LEFT JOIN ".MAIN_DB_PREFIX."xxxx_extrafields AS ef ON (ef.fk_object = t.rowid)
2023-04-28 09:31:33 +02:00
Laurent Destailleur
f44c97d3c6 Code is using the Universal Filter Syntax 2023-04-27 22:12:23 +02:00
Laurent Destailleur
3065b9ca6a Clean code 2023-04-27 21:15:27 +02:00
Laurent Destailleur
2f3cefcc09 Clean code 2023-04-26 11:41:02 +02:00
Frédéric FRANCE
057407554a use isModEnabled 2023-04-19 14:06:16 +02:00
Frédéric FRANCE
fa849696fb use isModEnabled 2023-04-18 20:16:02 +02:00
Laurent Destailleur
9a420b8f41 Clean code 2023-04-18 16:15:27 +02:00
FLIO
cbff9a6642 Merge branch 'develop' into editpropalattributes 2023-04-12 15:43:53 +02:00
FLIO
74c1bcf4e8 Fix to correspond to the requested table 2023-04-11 12:58:00 +02:00
FLIO
5e34099363 Fix to correspond to the requested table 2023-04-11 12:48:44 +02:00
Laurent Destailleur
0fb03fdc2d Clean code 2023-04-08 01:43:21 +02:00
FLIO
8463bce9f5 fix. the </td> were 3 lines down after the additional amount 2023-04-05 16:02:50 +02:00
FLIO
c7657ed3fd fix the missing condition and missing price total_ttc 2023-04-05 02:40:39 +02:00
FLIO
1ea251d813 new attributes on propal card 2023-04-04 16:10:02 +02:00
Laurent Destailleur
8898a1a432 Debug ajax tooltip 2023-04-03 19:51:40 +02:00
Laurent Destailleur
f1898e5ac0 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-03-31 02:54:22 +02:00
Laurent Destailleur
ec61e638a9 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-03-31 02:50:22 +02:00
Laurent Destailleur
dfd0bd8107 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-03-31 02:48:17 +02:00
Sylvain Legrand
639bf8ddd3 Update propal.class.php 2023-03-30 22:38:10 +02:00
Sylvain Legrand
a8d4ea406b Update description of products on cloning 2023-03-30 22:14:04 +02:00
Gilles Lengy
885b767a1f FIX|Fix #24298 No error or 0.00 instead of NULL in database anymore when emptying an extrafield of type price on a propal card 2023-03-22 20:26:19 +01:00
Laurent Destailleur
a50c0b8292 Fix missing include 2023-03-19 14:56:07 +01:00
Laurent Destailleur
6e26b7c03d
Merge pull request #24220 from frederic34/patch-13
fix missing include
2023-03-19 14:51:44 +01:00
Laurent Destailleur
6c110fb2b5 Fix warnings 2023-03-19 10:19:35 +01:00
Laurent Destailleur
ec43a8626e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2023-03-18 14:37:48 +01:00
Laurent Destailleur
dc2cb7fbb3 NEW Add dropdown button actions (example on Create button on project) 2023-03-18 14:10:23 +01:00
Laurent Destailleur
9cdb6b7bda
Merge branch 'develop' into customerordertooltip 2023-03-18 10:34:42 +01:00
Frédéric FRANCE
836e8348be
fix missing include 2023-03-15 11:08:20 +01:00
Frédéric FRANCE
c93d615e42 enhance tooltip ajax info 2023-03-14 22:27:35 +01:00
Laurent Destailleur
b97b85fa8c Look and feel v18 2023-03-14 12:05:25 +01:00
Laurent Destailleur
80678cfcb9 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-03-13 10:30:37 +01:00
Frédéric FRANCE
045d4284f5 fetch thirdparty in propal tooltip only in ajax request 2023-03-13 10:04:03 +01:00
Laurent Destailleur
2660948778 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-03-12 22:08:50 +01:00
Laurent Destailleur
60fe730a48 Look and feel v18 2023-03-12 13:56:15 +01:00
Laurent Destailleur
5ec52548ab For countries using the 2nd or 3rd tax, we force
MAIN_NO_INPUT_PRICE_WITH_TAX to disable input/edit of lines using the
price including tax (because 2nb and 3rd tax not yet taken into
account).
Work In Progress to support all taxes into unit price entry when
MAIN_UNIT_PRICE_WITH_TAX_IS_FOR_ALL_TAXES is set.
2023-03-11 20:37:01 +01:00
Laurent Destailleur
b1472b2e31 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-03-10 19:25:25 +01:00
Laurent Destailleur
1cf3cc4813
Merge pull request #24144 from frederic34/patch-8
Fix translation
2023-03-10 19:14:17 +01:00
bomuux
a655faf08d Update document.php 2023-03-10 14:53:37 +01:00