Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
129,604 Commits 36 Branches 189 Tags
40f18f5577b51b366d5f32799312433d35cf5598
Commit Graph

2201 Commits

Author SHA1 Message Date
Frédéric France
a859483384 translate comments 2024-01-23 20:14:35 +01:00
Laurent Destailleur
9873c6c6c2 Debug v20 2024-01-22 19:36:35 +01:00
Laurent Destailleur
6c6adc5333 Merge pull request #24911 from Easya-Solutions/new-productlot-make-sell-or-eat-by-mandatory2 
NEW make sell or eat by mandatory in product lot
 2024-01-22 15:21:34 +01:00
Laurent Destailleur
e8e6a217bd Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-01-18 21:09:27 +01:00
Laurent Destailleur
7acee285a8 Fix test 2024-01-18 21:07:05 +01:00
Laurent Destailleur
b7212cbac4 Try bette fix for #27586 2024-01-18 18:06:10 +01:00
Laurent Destailleur
aefd288f04 Fix merge pb 2024-01-17 18:55:28 +01:00
Laurent Destailleur
370262d1f3 Merge pull request #27099 from altairisfr/ordermode 
add constant SUPPLIER_ORDER_MODE_OPTIONAL
 2024-01-15 20:21:30 +01:00
VESSILLER
09e2b49b88 Fix resolve conflicts 2024-01-15 14:45:38 +01:00
VESSILLER
1a164eece5 Update from develop 2024-01-15 13:55:26 +01:00
MDW
bd002480ce Qual: Spelling htdocs/[d-k]* (#27427) 
Highlights:

- htdocs/install/doctemplates/websites/website_template-restaurant/containers/page249.tpl.php

  Potential functional change (fix) because toekn was changed to token:
   `<input type=hidden name=toekn`

- htdocs/install/upgrade2.php
  $filles changed to $children

- htdocs/intracommreport/class/intracommreport.class.php
  Local $enveloppe changed to $envelope.

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2024-01-13 19:48:41 +01:00
EchoLoGeek
8193ee33c2 Add llxHeader body css for supplier command 2024-01-10 11:45:35 +01:00
Laurent Destailleur
4501872f17 Clean code with rector 2 2024-01-05 04:33:58 +01:00
Laurent Destailleur
ccaae7ab24 Clean code 2024-01-05 03:41:22 +01:00
Christophe Battarel
13e92bbc6c fix getDolGlobalInt function name 2024-01-02 09:13:33 +01:00
Laurent Destailleur
3ef872bb3d Merge pull request #27175 from cfoellmann/19/PR/hooks-contact 
QUAL fix hooks on contact.php files - fixes contexts
 2023-12-27 16:05:00 +01:00
Christian Foellmann
045c623536 QUAL fix hooks on contact.php files - fixes contexts 2023-12-19 14:39:29 +01:00
Christian Foellmann
88c0700ee5 QUAL make UI strings differenciate between orders torward customer or supplier 2023-12-14 13:42:15 +01:00
Christophe Battarel
28634dc860 add constant SUPPLIER_ORDER_MODE_OPTIONAL 2023-12-14 12:25:05 +01:00
Laurent Destailleur
a7125280bc Fix with php-cs-fixer 2023-12-04 12:12:12 +01:00
Laurent Destailleur
3ecfc1b55f Fix css 2023-12-02 20:27:09 +01:00
Laurent Destailleur
6664190179 Clean code 
Should also make merge of #24911 after release easier. Note: Adding a
control on screen must be done after adding control into so we will
start by adding checkSellOrEatByMandatory() into create/update of
productlot.
 2023-11-28 12:40:21 +01:00
Laurent Destailleur
7785ae93a1 Fix php8.2 warnings 2023-11-27 11:41:05 +01:00
Laurent Destailleur
1ac9bcab59 Debug v19 2023-11-24 16:30:31 +01:00
Laurent Destailleur
cb3a86a737 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2023-11-23 18:56:10 +01:00
IC-Nicolas
47de053b06 NEW &arrayfields into doAction (#26832) 2023-11-23 17:09:52 +01:00
Saami PERDRIX
7e9947a3e6 FIX php8 fatal on edit supplier order when multicurrency is activated (#26758) 2023-11-20 20:17:44 +01:00
Laurent Destailleur
a0bba05b02 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/class/api_orders.class.php
	htdocs/compta/facture/card.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/lib/project.lib.php
	htdocs/fourn/class/api_supplier_orders.class.php
	htdocs/fourn/class/fournisseur.facture-rec.class.php
	htdocs/langs/en_US/stocks.lang
 2023-11-17 18:24:53 +01:00
Laurent Destailleur
5db512229b Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-11-17 17:58:48 +01:00
Maxime Kohlhaas
d7851240b4 Fix : on supplier order, vat for all lines wasn't working with 0 value (#26675) 2023-11-17 16:27:00 +01:00
VESSILLER
eb45e9e5c7 Resolve conflicts 2023-11-07 16:08:11 +01:00
Christophe Battarel
13072a1df2 add hook tabContentViewSupplierOrder (#26417) 
Co-authored-by: Christophe Battarel <christophe@altairis.fr>
 2023-11-01 14:24:31 +01:00
Christophe Battarel
002f10a9aa NEW : add hook tabContentCreateSupplierOrder (#26418) 
* add hook tabContentViewSupplierOrder

* wrong hook name

---------

Co-authored-by: Christophe Battarel <christophe@altairis.fr>
 2023-11-01 14:24:10 +01:00
Laurent Destailleur
e1bf377f20 QUAL: Removed deprecated field remise, remise_percent, remise_absolute 2023-10-20 10:47:08 +02:00
Alexandre SPANGARO
58bdcb5245 Dolibarize - Look & feel v19 (#26246) 
* NEW Accountancy - Add quick navigation with keyb. shortcut on ledger

* TitleSeparator - Job list

* TitleSeparator - Position list

* TitleSeparator

* TitleSeparator

* TitleSeparator

* Define $newcardbutton

* Define $newcardbutton

* Define $newcardbutton

* Define $newcardbutton

* Define $newcardbutton

* Define $newcardbutton

* Define $newcardbutton

* Variable $newcardbutton already define

* Define $newcardbutton

* TitleSeparator

* TitleSeparator

* TitleSeparator

* TitleSeparator

* TitleSeparator
 2023-10-20 03:20:44 +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
cdf9389b58 CSS v19 2023-10-15 22:02:33 +02:00
Laurent Destailleur
4f4ede2e32 Fix php8.2 warnings 2023-10-15 18:14:14 +02:00
Laurent Destailleur
c32fe8dc5f QUAL: Use dol_clone with parameter 2 for ->oldcopy 2023-10-11 19:10:24 +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
Laurent Destailleur
d5443010f2 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-10-01 16:04:16 +02:00
Laurent Destailleur
8cfac1a901 Merge pull request #25976 from frederic34/patch-6 
fix line rank in massaction supplier order to supplier invoice
 2023-09-25 02:21:14 +02:00
Frédéric FRANCE
058736a944 Update list.php 2023-09-22 08:58:27 +02:00
Laurent Destailleur
68f90319e0 Clean code 2023-09-22 03:24:48 +02:00
Laurent Destailleur
257a961a93 Fix error management 2023-09-22 02:32:23 +02:00
Laurent Destailleur
e9f80875b7 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-22 01:19:49 +02:00
Laurent Destailleur
94f4521f19 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 
Conflicts:
	htdocs/accountancy/class/accountancyexport.class.php
	htdocs/commande/class/commandestats.class.php
 2023-09-21 19:30:02 +02:00
Frédéric FRANCE
97c77e611e Update list.php 2023-09-20 11:15:42 +02:00
Frédéric FRANCE
43a3783e79 fix line rank in massaction supplier order to supplier invoice 2023-09-20 09:25:39 +02:00
Laurent Destailleur
579dabb909 Merge pull request #25950 from frederic34/patch-7 
fix origin id of order_supplier when creating one invoice_supplier
 2023-09-19 23:35:48 +02:00