Commit Graph

1329 Commits

Author SHA1 Message Date
Laurent Destailleur
921a6f3135 Fix warning 2023-08-06 12:26:27 +02:00
Laurent Destailleur
0076ec69b8 The property ->brouillon has been removed from all classes. It was not
reliable and was a duplicate of ->status == self::STATUS_DRAFT.
2023-08-06 00:16:25 +02:00
Laurent Destailleur
ea364ff1a3 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-08-05 13:47:17 +02:00
Laurent Destailleur
bef9146bb1 Fix warnings 2023-08-05 12:50:09 +02:00
Laurent Destailleur
9302a427a9 Debug v19 2023-07-31 03:29:45 +02:00
Laurent Destailleur
e01f05cf96 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-07-02 21:16:50 +02:00
Laurent Destailleur
15b7f736a7 Fix warning 2023-07-01 13:07:14 +02:00
Laurent Destailleur
02ca89cf52 Merge pull request #25234 from FHenry/16_fix_calc_update_price_on_update
FIX: VTA rounding calc option must be the same on update line as on create line
2023-06-29 17:41:09 +02:00
Florian HENRY
505ea31c30 FIX: TVA calc option must be the same on update line as on create line 2023-06-29 16:50:21 +02:00
Frédéric FRANCE
e74d8fa54d use isModEnabled 2023-06-29 14:04:39 +02:00
Frédéric France
a575b696e7 use user hasRight 2023-06-19 23:27:24 +02:00
Laurent Destailleur
6b94d60d9a Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-06-16 01:36:46 +02:00
Laurent Destailleur
00431c1ece Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-06-16 01:09:56 +02:00
Laurent Destailleur
2695dd2e7a Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
Conflicts:
	htdocs/comm/propal/card.php
2023-06-10 12:11:57 +02:00
hystepik
597b36e57c Fix : php8.1 warnings with strict mode 2023-06-10 10:47:36 +02:00
Jean
e1939d1c06 FIX #20304 propaldates update 2023-06-10 09:55:47 +02:00
Frédéric FRANCE
2752154f9b Update propal.class.php 2023-05-31 13:56:41 +02:00
Laurent Destailleur
476f95c4f6 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/adherents/subscription/list.php
	htdocs/comm/action/index.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/core/modules/propale/doc/pdf_cyan.modules.php
	htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
	htdocs/cron/class/cronjob.class.php
	htdocs/eventorganization/class/conferenceorbooth.class.php
	htdocs/modulebuilder/template/myobject_list.php
	htdocs/public/ticket/list.php
	htdocs/supplier_proposal/list.php
	htdocs/ticket/class/ticket.class.php
2023-05-17 00:57:17 +02:00
Laurent Destailleur
c8186209ad Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0
Conflicts:
	htdocs/expedition/card.php
	htdocs/install/mysql/migration/15.0.0-16.0.0.sql
	htdocs/install/mysql/tables/llx_overwrite_trans.key.sql
	htdocs/projet/tasks.php
	htdocs/projet/tasks/time.php
2023-05-17 00:36:12 +02:00
Laurent Destailleur
9743bbde60 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-05-16 19:46:09 +02:00
stickler-ci
2c97b66c24 Fixing style errors. 2023-05-16 14:57:46 +00:00
avolani
79cacf58c2 Update propal.class.php
Fix IDs on created proposal lines when cloning so the hook createFrom has all the clone infos
2023-05-16 16:53:58 +02:00
Laurent Destailleur
5dd3f57a1e Debug v18 2023-05-11 13:11:21 +02:00
Laurent Destailleur
4028b5d568 Clean code 2023-04-29 13:13:12 +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
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
Laurent Destailleur
8898a1a432 Debug ajax tooltip 2023-04-03 19:51:40 +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
Frédéric FRANCE
c93d615e42 enhance tooltip ajax info 2023-03-14 22:27:35 +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
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
ae8b213d04 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-03-10 13:31:02 +01:00
Laurent Destailleur
c7431b83ec Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-03-10 13:14:13 +01:00
Laurent Destailleur
7a59c0ef4b Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-03-10 13:03:11 +01:00
Laurent Destailleur
a92081cf43 Debug Kanban views 2023-03-07 22:04:40 +01:00
Laurent Destailleur
2b4f4e9e4a Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-03-04 15:25:58 +01:00
Laurent Destailleur
89810f97c1 Merge pull request #23941 from ATM-Consulting/FIX_propalestats_SQL_unknown_column_fk_soc
FIX: SQL error "unknown column p.fk_soc"
2023-03-03 13:41:32 +01:00
Laurent Destailleur
925cd10cee Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-03-03 13:30:02 +01:00
GregM
87fa075ce0 Fix 16.0 propalestats 2023-03-03 10:20:45 +01:00
Laurent Destailleur
46945ec44c Merge pull request #24073 from hregis/fix_multicompany_compatibility2
TODO remise_percent is a deprecated field for object parent
2023-03-02 16:31:51 +01:00
Laurent Destailleur
41d9463992 Merge pull request #24062 from BB2A/FIX---php8-warnning-localtaxes_type
FIX - php8 warnning localtaxes_type
2023-03-02 14:10:33 +01:00
stickler-ci
de86f0ecaa Fixing style errors. 2023-03-02 12:52:12 +00:00
Laurent Destailleur
9fd9b0cfa0 Merge branch 'develop' into fix_multicompany_compatibility2 2023-03-02 13:42:40 +01:00
Laurent Destailleur
12bd795afc Work on Kanban view 2023-03-01 20:13:21 +01:00
Regis Houssin
d3c65e390b TODO remise_percent is a deprecated field for object parent 2023-02-28 15:47:33 +01:00
Anthony Berton
eb16050918 FIX - php8 warnning localtaxes_type 2023-02-27 17:26:21 +01:00
Laurent Destailleur
ed5c890769 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-02-25 20:12:48 +01:00