Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
118,434 Commits 36 Branches 189 Tags
e0da8a2109d6b10366ccb4610394d2bc61e4213f
Commit Graph

1122 Commits

Author SHA1 Message Date
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
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
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
Jean
e1939d1c06 FIX #20304 propaldates update 2023-06-10 09:55:47 +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
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
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
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
cbb6ca071a Fix #yogosha15157 2023-02-25 19:51:05 +01:00
atm-florian
b29ebef05f Propale stats: reworking of the fix to comply with travis rule for SQL string building 2023-02-23 18:03:00 +01:00
Laurent Destailleur
50baadbe0a Fix warning 2023-02-21 13:27:21 +01:00
atm-florian
c3e42f1961 Propale stats: replace old-style joins with inner joins 2023-02-17 16:12:06 +01:00
atm-florian
e212019ddf FIX: SQL error "unknown column p.fk_soc" because ANSI-92 joins take precedence over ANSI-89 joins 
cf. https://stackoverflow.com/questions/4065985/mysql-unknown-column-in-on-clause
 2023-02-17 00:10:00 +01:00
Laurent Destailleur
cd5009d8a4 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-01-18 21:21:49 +01:00
Laurent Destailleur
283ad1abcf Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-01-18 20:54:16 +01:00
Laurent Destailleur
2a299068ad Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-01-18 20:45:44 +01:00
stickler-ci
4ee0ede6d8 Fixing style errors. 2023-01-18 08:53:28 +00:00
Noé Courtier
d344e108c9 FIX: Errors Handling for CreateFrom Hooks 2023-01-18 09:44:23 +01:00
Laurent Destailleur
50c76110bb Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2022-12-14 11:19:12 +01:00
Laurent Destailleur
62b0447c7b Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-12-14 11:02:23 +01:00
Laurent Destailleur
64de591770 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-12-14 10:20:47 +01:00
Florian HENRY
ab8a61aeaa fix: propal when back to draft delete ip and name of web sign 2022-12-02 11:59:47 +01:00
Florian HENRY
8ddc4c8db6 FIX: propal and order stats broken on Tag+User(retricted customer list) 2022-12-01 14:28:00 +01:00
Laurent Destailleur
f79e52bc85 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-11-22 13:42:17 +01:00
Laurent Destailleur
322124690c Fix sql syntax error 2022-11-21 14:47:31 +01:00
Laurent Destailleur
2dc6fe9785 Merge pull request #22865 from FliyFly/bugErrorCode 
Fix(Scrutinizer) add public
 2022-11-16 11:22:19 +01:00
FLIO
73db58a700 Fix(Scrutinizer) add public 2022-11-15 17:10:04 +01:00
Laurent Destailleur
7238575a6d Clean code and add context information for onlineSign 2022-11-14 22:40:42 +01:00
Laurent Destailleur
08985fbe62 Merge pull request #22792 from noec764/14_FIX_Add_Missing_LibStatut_Hooks 
FIX: Add Missing "LibStatut" hooks in propal, commande, facture
 2022-11-09 15:39:43 +01:00
stickler-ci
89876d8d52 Fixing style errors. 2022-11-08 15:24:05 +00:00
Noé Courtier
73b857c1b3 FIX: Add Missing "LibStatut" hook in propal, commande, facture 2022-11-08 16:21:32 +01:00
Laurent Destailleur
f87ec74b9f Replace LEFT JOIN with EXISTS 2022-10-22 00:22:54 +02:00
Laurent Destailleur
2484fefa4d Fix deprecated 2022-10-16 21:01:05 +02:00
Richard Franks
d3b0c190d5 Sorted Proposal not saving ref_ext 2022-10-14 09:44:49 +01:00
Frédéric France
3a3dad6fb8 Merge remote-tracking branch 'upstream/develop' into pr/dolibit-ut/22136 2022-09-28 20:23:40 +02:00
Philippe GRAND
fb9db96ecc update code toward php8 compliance 2022-09-24 14:37:57 +02:00
Laurent Destailleur
6fb9a4713c Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-09-21 01:30:40 +02:00
Regis Houssin
a3a973466f FIX broken feature, wrong fk_parent_line after cloning object 2022-09-13 15:16:17 +02:00
Frédéric France
705b436494 replace other deprecated 2022-09-10 14:03:47 +02:00
Laurent Destailleur
7c7ccc2393 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-09-09 01:45:59 +02:00
Laurent Destailleur
fb60c100e5 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-09-09 01:39:52 +02:00
Laurent Destailleur
3177a065cd Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-09-09 01:31:43 +02:00
Laurent Destailleur
6b3095ae9a Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-09-08 14:10:28 +02:00
Laurent Destailleur
f1d19ae3de Merge pull request #21839 from bb2a/date16 
FIX - Edit propal date
 2022-09-07 16:27:53 +02:00