Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
128,557 Commits 36 Branches 189 Tags
ffcc89d3876b402162bc3c0756b6f415e332fb04
Commit Graph

7840 Commits

Author SHA1 Message Date
Laurent Destailleur
859ab08d35 Update 18.0.0-19.0.0.sql 2024-01-18 14:16:28 +01:00
Laurent Destailleur
eb505f9b6e Merge branch 'develop' into addColumnInwebsiteTable 2024-01-18 14:15:58 +01:00
Mathieu "rid" Soula
e1dc6d5140 Fix add tms field into llx_bom_bomline 2024-01-17 16:07:56 +01:00
Mathieu "rid" Soula
3ac5a222cd Add tms columns into llx_bom_bomline table 2024-01-17 16:04:50 +01:00
Laurent Destailleur
59100debb0 Merge pull request #27531 from vmaury/Fix_error_in_supplier_order_odt_template 
Fix errors in supplier order odt template
 2024-01-15 14:02:55 +01:00
vmaury
cf67b09e06 Fix errors in supplier order odt template 2024-01-15 11:57:35 +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
Laurent Destailleur
e948916e6f Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-01-13 11:18:04 +01:00
Laurent Destailleur
4cf06431ff Fix template 2024-01-12 22:30:30 +01:00
Laurent Destailleur
a3e354c9b0 Fix phan report 2024-01-12 22:19:59 +01:00
Mohamed DAOUD
1e01321294 NEW: add position column in category table (#27425) 
* add position column in category table

* Update 19.0.0-20.0.0.sql

* Update llx_categorie.sql

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2024-01-12 19:55:23 +01:00
MDW
417726f7b1 Fix: Disable execute bit in git + correct shebangs (#27450) 
# Fix: Execute bits in git and shebangs

Some files had the execute bit improperly set to enabled.
Some scripts did not have a correct shebang.
 2024-01-12 17:10:16 +01:00
Laurent Destailleur
aba9afe9f1 NEW Add method getPublicImageOfObject() for website module 2024-01-12 13:05:28 +01:00
Laurent Destailleur
1647e4f133 Debug the filter on VAT type 2024-01-11 12:38:01 +01:00
Laurent Destailleur
52dfdbc7ad Merge branch 'develop' into 18a3 2024-01-11 11:27:10 +01:00
HENRY Florian
f00c80f33e NEW: add column to store a label for the price (#27238) 
* NEW: add column to store a label for the price

* review
 2024-01-11 10:51:49 +01:00
MDW
58ba3e31fa Qual: Fix spelling for crypted and referer (#27408) 
# Qual: Fix spelling for crypted and referer.

The proper spelling is encrypted and referrer, but the code has
some occurences where referer and crypted need to be maintained.

To make verification easier, this spelling correction is limited to
mostly these corrections and some minor translations and a only a
few other corrections.

crypted and referer are added as exceptions for spelling after this fix.

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2024-01-11 10:07:06 +01:00
Laurent Destailleur
02051ebf38 Fix phpunit 2024-01-09 14:10:31 +01:00
Laurent Destailleur
e6dbcf2f82 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-01-09 10:45:03 +01:00
Laurent Destailleur
9fdfa6fdb3 Doc 2024-01-09 09:18:56 +01:00
Florian HENRY
a6adeade58 reveiw 2024-01-08 21:15:57 +01:00
Florian HENRY
16569a157a Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into dev_product_rel_thirdparty 2024-01-08 21:15:15 +01:00
Laurent Destailleur
4e0d5dd590 Fix date creation of categori is empty 2024-01-08 11:39:27 +01:00
Lamrani Abdel
133b2a43ce add in migration file 2024-01-06 19:24:46 +01:00
Lamrani Abdel
7187e199fd Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into addColumnInwebsiteTable 2024-01-06 19:24:01 +01:00
Frédéric FRANCE
c16f3bbbdf fix incorrect case of class 2024-01-05 09:43:44 +01:00
Alexandre Janniaux
425f10d71e install: upgrade2: add missing modules 
Those modules cannot be enabled from the upgrade2 script if they are not
in the list.
 2024-01-05 01:28:53 +01:00
Alexandre Janniaux
dc85ae541a install: upgrade2: add missing modules 
Those modules cannot be enabled from the upgrade2 script if they are not
in the list.
 2024-01-04 17:07:22 +01:00
Roger Dueck
bd83990585 Use unique keys to link extrafields tables, fixes #22117 and #22467 2024-01-03 08:50:01 -07:00
Laurent Destailleur
f8375a5262 Add 19.0.0 to 20.0.0 2024-01-03 16:02:08 +01:00
Laurent Destailleur
5ae29f4052 Fix check php native imap only if php <= 8.3 2024-01-02 12:58:40 +01:00
Laurent Destailleur
77306d7155 Fix sql 2024-01-01 20:14:11 +01:00
Florian HENRY
bb4d33a454 NEW: add table to store product relation with thirdparty 2023-12-28 13:12:03 +01:00
Florian HENRY
1a499172f5 NEW: add table to store product relation with thirdparty 2023-12-28 13:10:50 +01:00
Florian HENRY
381cb6982c NEW: add table to store product relation with thirdparty 2023-12-28 13:10:23 +01:00
Florian HENRY
6d0ca0be81 NEW: add table to store product relation with thirdparty 2023-12-28 13:09:43 +01:00
Florian HENRY
72beb3b7d6 NEW: add table to store product relation with thirdparty 2023-12-28 13:06:45 +01:00
Laurent Destailleur
b28ae5d8d3 Clean code 2023-12-27 12:12:20 +01:00
Lamrani Abdel
e4356ef635 add column in table website 2023-12-19 15:53:17 +01:00
Lamrani Abdel
0214123a70 Merge branch 'addColumnInwebsiteTable' of github.com:lamrani002/dolibarr into addColumnInwebsiteTable 2023-12-18 18:42:28 +01:00
Lamrani Abdel
b61d6f43dc add column in table 2023-12-18 18:41:38 +01:00
lamrani abdelwadoud
20b1917bdb Merge branch 'develop' into addColumnInwebsiteTable 2023-12-18 18:40:05 +01:00
Laurent Destailleur
98009ea6be Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/compta/bank/class/account.class.php
	htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
	htdocs/langs/en_US/recruitment.lang
	htdocs/master.inc.php
	htdocs/projet/contact.php
 2023-12-17 22:17:14 +01:00
Laurent Destailleur
b99fcbb5ad Remove deprecated files in migration 2023-12-16 20:14:47 +01:00
Laurent Destailleur
68d89d4421 Fix pgsql install 2023-12-14 15:29:20 +01:00
Laurent Destailleur
1a7f674bd5 Fix add tms field to help debug v19 and sepa payment pbs 2023-12-14 14:01:28 +01:00
ATM-NicolasV
f4099bdf28 missing require_once .'/core/lib/security.lib.php' for dol_hash() 2023-12-13 09:41:20 +01:00
Lamrani Abdel
98bf06c5fc New column in website table for stock name of template imported 2023-12-11 17:55:20 +01:00
Laurent Destailleur
453d5e5c26 Fix #yogosha19443 2023-12-08 23:45:18 +01:00
Frédéric FRANCE
61b79fda17 avoid phpstan error with phpdoc 2023-12-06 15:46:39 +01:00