Commit Graph

121496 Commits

Author SHA1 Message Date
Christophe Battarel
482b9756a2 typo 2023-05-19 11:54:51 +02:00
Christophe Battarel
8e7d1a9f23 NEW : TAkePOS - dont allow payment if no thirdparty selected 2023-05-19 11:54:21 +02:00
Laurent Destailleur
d97a891f6c Responsive 2023-05-18 12:15:36 +02:00
Laurent Destailleur
862460a2dd Doc 2023-05-18 12:09:42 +02:00
Laurent Destailleur
3526c49921 Add column town_up 2023-05-18 11:56:34 +02:00
Laurent Destailleur
3f32f9ae55 Fix transfer 2023-05-17 20:02:12 +02:00
Laurent Destailleur
9bcbe23792 Fix message in output of batch to send invoice on validation date 2023-05-17 19:44:02 +02:00
Laurent Destailleur
8eb65373b1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-05-17 17:52:12 +02:00
Laurent Destailleur
452a625a45 Merge pull request #24788 from FliyFly/editsupplierpattribute
New attributes on supplier proposal card
2023-05-17 16:08:22 +02:00
Laurent Destailleur
37d709475d Merge pull request #24734 from romain-neil/feat-buildoc-supplier-inv
Draft: api/documents: generate supplier invoices
2023-05-17 16:01:20 +02:00
Laurent Destailleur
01d76a3bef Merge pull request #24804 from altairisfr/hidehistory
NEW : add constant to hide hisory button in takepos
2023-05-17 15:59:05 +02:00
Laurent Destailleur
f78783cc5e css 2023-05-17 15:55:29 +02:00
Christophe Battarel
11b747ec20 add constant to hide hisory button in takepos 2023-05-17 15:51:35 +02:00
Laurent Destailleur
663dfe2984 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-05-17 15:44:38 +02:00
Laurent Destailleur
c3126375af Fix composer - add rector conf 2023-05-17 15:44:26 +02:00
Laurent Destailleur
ed4d748a6b Fix tooltip non visible 2023-05-17 15:42:53 +02:00
Laurent Destailleur
96f577f1fb Merge pull request #24791 from frederic34/patch-1
fix warnings in member pages
2023-05-17 15:26:29 +02:00
Laurent Destailleur
d3eea36e35 Merge pull request #24794 from daraelmin/patch-2
FIX PHP 8 Warning in adherent index.php
2023-05-17 15:21:37 +02:00
Laurent Destailleur
3f1572c7f8 Merge pull request #24793 from daraelmin/patch-1
Fix PHP 8 Warning in box member type
2023-05-17 15:21:20 +02:00
Laurent Destailleur
c8c2141573 Merge pull request #24797 from daraelmin/patch-5
FIX PHP 8 Warning in adherent categorie view
2023-05-17 15:20:41 +02:00
daraelmin
8996e51e68 FIX PHP 8 Warning in adherent categorie view 2023-05-17 14:09:57 +02:00
daraelmin
e7e781d1eb FIX PHP 8 Warning in adherent index.php 2023-05-17 12:38:10 +02:00
daraelmin
95a42312ec Fix PHP 8 Warning in box member type 2023-05-17 12:32:23 +02:00
Frédéric FRANCE
436b23bc1a Update box_members_by_type.php 2023-05-17 12:28:41 +02:00
Laurent Destailleur
5dae5b57a0 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2023-05-17 12:27:46 +02:00
Laurent Destailleur
4354cad74b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-05-17 12:25:17 +02:00
Frédéric FRANCE
bed87447c4 fix warnings 2023-05-17 12:25:01 +02:00
Laurent Destailleur
bc2e095dec Debug v18 2023-05-17 01:09:09 +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
77b976163c Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 17.0
Conflicts:
	htdocs/expedition/card.php
2023-05-17 00:37:40 +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
c1a5ce3578 Debug v18 2023-05-17 00:20:36 +02:00
FLIO
a42325e166 New attributes on supplier_proposal card 2023-05-17 00:08:40 +02:00
FLIO
eeb52bcd1a remove change 2023-05-17 00:07:09 +02:00
FLIO
74beeb4fce New attributes on supplier_proposal card 2023-05-17 00:04:50 +02:00
Laurent Destailleur
9d8af9c530 Fix restore option to have non samples stats 2023-05-17 00:04:37 +02:00
Laurent Destailleur
0ec45022ea Merge pull request #24767 from daraelmin/daraelmin-stats-adh-by-status
NEW : Uniformize member stats in boxes and index
2023-05-16 23:22:22 +02:00
Laurent Destailleur
4f2adabd1c Merge pull request #24783 from rycks/add_hook_on_paymentmodes
add hook to be able to insert lists of payments
2023-05-16 22:53:18 +02:00
Laurent Destailleur
20a9dc1951 Add field ref_ext in table of timespent 2023-05-16 22:33:32 +02:00
Laurent Destailleur
9635fa35d8 Merge pull request #24706 from alexandre-janniaux/constructor-bump-phpunit/1
FIX test/phpunit: add $name to __construct()
2023-05-16 20:58:15 +02:00
Laurent Destailleur
ca18bfc587 Merge pull request #24705 from mrbidon/develop
Add hidden option COMPANY_AQUARIUM_NO_PREFIX to ignore PREFIX
2023-05-16 20:55:35 +02:00
Laurent Destailleur
be816bf9d0 Merge pull request #24709 from bomuux/develop
FIX: Inventory lines values deleted when changing page length
2023-05-16 20:54:16 +02:00
Laurent Destailleur
86122780a9 Merge pull request #24708 from ptibogxiv/patch-83
FIX list orders API
2023-05-16 20:53:05 +02:00
Laurent Destailleur
2c6ca0364a Merge pull request #24711 from aspangaro/18a6
FIX #24690 Product list - Search on accountancy account product with virtual zero
2023-05-16 20:52:21 +02:00
Laurent Destailleur
997ef573fa Merge pull request #24712 from fappels/16_fix_ecotaxe_dict
Fix search in hidden ecotaxe dictionary by code.
2023-05-16 20:51:42 +02:00
Laurent Destailleur
53c835419e Merge pull request #24713 from altairis-benjamin/fixPublicTicketTokens
FIX token errors on public interface
2023-05-16 20:51:07 +02:00
Laurent Destailleur
df4472b1f4 Merge pull request #24721 from hregis/fix_takepos_php8
FIX missing constant and avoid submit button conflict
2023-05-16 20:46:34 +02:00
Laurent Destailleur
f5ecf0beb3 Merge pull request #24727 from MaximilienR-easya/dev_New_update_ref_if_already_taken
update ticket ref when the ref is already used at the creation
2023-05-16 20:20:44 +02:00
Laurent Destailleur
da1bd3a725 Merge pull request #24759 from frederic34/patch-5
add errors-to for swiftmailer
2023-05-16 20:15:35 +02:00
Laurent Destailleur
8fa177d8eb Trans 2023-05-16 20:01:26 +02:00