Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-28 11:43:21 +01:00
Code Issues Packages Projects Releases Wiki Activity
129,525 Commits 38 Branches 191 Tags
b1492818f61ba4e9ee97eed24ae827e69c8d64fc
Commit Graph

759 Commits

Author SHA1 Message Date
Laurent Destailleur
211d21306c Merge pull request #32163 from glu000/19.0-fix-32161 
Fix #32161 - Payment terms are not taken from thirdparty when proposal is created from project
 2024-12-03 21:59:56 +01:00
Günter Lukas
c01ab2b7ea Update card.php 2024-11-30 13:36:13 +01:00
Günter Lukas
23617a11fc Update card.php 2024-11-30 13:34:17 +01:00
Günter Lukas
677525a663 Update card.php 2024-11-30 11:08:17 +01:00
Günter Lukas
f5d639b841 Update card.php 2024-11-30 11:04:35 +01:00
Günter Lukas
fe3fb72e5e Fix #32161 2024-11-30 10:54:32 +01:00
Günter Lukas
9dcabdbab6 Fix #32158 2024-11-30 10:05:48 +01:00
Laurent Destailleur
0ed4c9f8e7 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-10-24 19:59:03 +02:00
atm-corentin
c48b035a15 FIX issue on action set condition in particular when you set a deposi… (#31518) 
* fix issue on action set condition in particular when you set a deposit cond on propal

* fix some identation issues

* fix retour github actions pre commit

* Update card.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2024-10-23 22:59:46 +02:00
Laurent Destailleur
8bfc0779c4 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-03-13 22:20:08 +01:00
Laurent Destailleur
a0b26ae7cd FIX Amount of localtaxes in foreign currency was wrong on screen and PDF 2024-03-13 22:04:44 +01:00
Laurent Destailleur
ff2d609814 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/mrp/mo_production.php
 2024-02-12 03:35:39 +01:00
lvessiller-opendsi
e3ad92df44 FIX check parameter socid before cloning a customer proposal (#28085) 2024-02-09 14:09:03 +01:00
Laurent Destailleur
64e246a4f6 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-01-26 01:53:38 +01:00
Maximilien Valenzano
da625fc847 fix: propal use devise changes 2024-01-25 12:06:13 +01:00
Laurent Destailleur
cca01cbda4 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2024-01-23 22:15:36 +01:00
VESSILLER
26a05d3046 FIX update price extrafield on propal card 2024-01-19 10:15:42 +01:00
Laurent Destailleur
569d9426d7 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-01-12 21:40:51 +01:00
Laurent Destailleur
4374aa1a20 FIX Bad visible status of proposal after reopen 2024-01-12 16:31:49 +01:00
Laurent Destailleur
ba10d60a0b Fix with php-cs-fixer 2023-12-04 12:02:35 +01:00
Laurent Destailleur
53dab922fd Fix php8.2 warnings 2023-11-27 11:39:32 +01:00
Laurent Destailleur
a48e541093 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/class/bookkeeping.class.php
	htdocs/accountancy/journal/expensereportsjournal.php
	htdocs/core/class/html.formadmin.class.php
	htdocs/core/lib/functions.lib.php
 2023-11-12 23:18:19 +01:00
Laurent Destailleur
2f340a1a77 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 
Conflicts:
	htdocs/accountancy/journal/expensereportsjournal.php
	htdocs/comm/propal/card.php
 2023-11-12 23:06:31 +01:00
atm-lena
0946220e9b Check price base type (#26503) 
Co-authored-by: atm-lena <lena.papazian@atm-consulting.fr>
 2023-11-09 15:41:39 +01:00
Laurent Destailleur
c154a72d88 Debug v19 2023-11-06 19:32:04 +01:00
Christophe Battarel
9580f5bc11 add hook tabContentCreateProposal (#26411) 
Co-authored-by: Christophe Battarel <christophe@altairis.fr>
 2023-11-01 14:25:33 +01:00
Christophe Battarel
010f2cd9b8 New : Add hook tabContentViewProposal (#26400) 
* add hook tabContentViewProposal

* update credentials

---------

Co-authored-by: Christophe Battarel <christophe@altairis.fr>
 2023-10-31 11:54:18 +01:00
Laurent Destailleur
e1bf377f20 QUAL: Removed deprecated field remise, remise_percent, remise_absolute 2023-10-20 10:47:08 +02:00
Laurent Destailleur
0fbffea663 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-17 14:49:16 +02:00
Laurent Destailleur
fb8b4acdbf The duplicated and deprecated property ->date_livraison that was renamed 
into ->delivery_date has been completely removed.
 2023-10-17 10:36:11 +02:00
Laurent Destailleur
9144293f0b Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-10-16 06:02:17 +02:00
Laurent Destailleur
0360d61f9c Code comment for develop 2023-10-16 05:51:47 +02:00
Laurent Destailleur
abe3f00b11 Fix regression. Restore old behaviour even if some case are not tested. 2023-10-16 05:15:39 +02:00
Noé Cendrier
a92458ebbc FIX check tva_tx before comparing price_min_ttc (#25220) 
* FIX check tva_tx before comparing price_min_ttc

* better price_ttc comparison for propal, commande, facture lines

* price_ht must be transformed into number before using it for calculating
 2023-10-16 04:07:10 +02:00
Laurent Destailleur
1f38e54e78 Clean code 2023-10-15 15:32:35 +02:00
Laurent Destailleur
c32fe8dc5f QUAL: Use dol_clone with parameter 2 for ->oldcopy 2023-10-11 19:10:24 +02:00
Laurent Destailleur
e488243dd8 Standardize code 2023-10-11 11:34:42 +02:00
Laurent Destailleur
946239dbf3 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-10 23:04:47 +02:00
Laurent Destailleur
d3dd3dacfe Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-10-10 22:52:04 +02:00
Laurent Destailleur
4cb3ecb11e Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-10-10 22:47:20 +02:00
Laurent Destailleur
94e8580cbb Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-10-10 22:39:52 +02:00
Laurent Destailleur
152b0178c5 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-10-10 22:38:20 +02:00
dev2a
765d60efdf Fix: Apply rector rule user permission on comm folder (#26163) 2023-10-10 09:14:30 +02:00
Laurent Destailleur
e2d3404651 Merge pull request #22475 from atm-kevin/FIX_Enable_Negative_Qty_In_Propal 
FIX : Propal's negative quantities
 2023-10-06 19:10:07 +02:00
Laurent Destailleur
f5534586c1 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-05 21:09:21 +02:00
Laurent Destailleur
4afda75a4d Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-10-05 21:01:34 +02:00
Andrés Maldonado
ab1071b70a FIX: modification of complementary attributes in commercial proposals 
The db object must not be cloned in order to avoid a PHP Fatal error:  Uncaught Exception: Serialization of 'PgSql\Connection' is not allowed
 2023-10-04 18:31:20 +02:00
Andrés Maldonado
54a0245c4d FIX: modification of complementary attributes in commercial proposals 
The db object must not be cloned in order to avoid a PHP Fatal error:  Uncaught Exception: Serialization of 'PgSql\Connection' is not allowed

This commit replaces the dol_clone function by the one in the 17.0 branch
 2023-10-04 17:48:30 +02:00
Laurent Destailleur
4298150413 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/core/lib/signature.lib.php
 2023-10-04 10:22:33 +02:00
Laurent Destailleur
b8bd760e28 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-01 16:06:58 +02:00