lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
104,253 Commits 43 Branches 150 Tags 886 MiB
d891dd8ddc
Commit Graph

104253 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
d891dd8ddc Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/stocks.lang
	htdocs/product/stats/card.php
	htdocs/projet/element.php
	htdocs/salaries/card.php
 2021-10-31 16:19:10 +01:00
Laurent Destailleur
15406f16d2
Merge pull request #19215 from FHenry/14_fix_catagorie_method 
fix: getFilterSelectQuery get correct table
 2021-10-31 16:13:36 +01:00
Laurent Destailleur
f989b145af Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-31 15:59:23 +01:00
Laurent Destailleur
4f2cd2ba18 FIx #19227 2021-10-31 15:59:03 +01:00
Laurent Destailleur
707dd85f43
Merge pull request #19242 from aspangaro/14p25 
FIX Accountancy - Product admin - Log error when we affect accounting account with product_perentity activated
 2021-10-31 15:22:01 +01:00
Laurent Destailleur
82e7c4b237
Merge pull request #19244 from hregis/fix_missing_access_right 
FIX missing service access right
 2021-10-31 15:15:33 +01:00
Laurent Destailleur
e6e440e573 Fix #19257 error in the page Overview of a project 2021-10-31 15:14:15 +01:00
Laurent Destailleur
8064ecce73 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-10-31 14:38:07 +01:00
Laurent Destailleur
da4fe03be7 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/core/class/html.formticket.class.php
	htdocs/ticket/card.php
 2021-10-31 14:37:33 +01:00
Laurent Destailleur
ca8dab36a3 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/class/html.formticket.class.php
	htdocs/core/modules/modAdherent.class.php
	htdocs/core/modules/modProjet.class.php
 2021-10-31 14:33:44 +01:00
Laurent Destailleur
01c6de1085 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-10-31 14:24:53 +01:00
Laurent Destailleur
6d918ad1c7 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-10-31 14:24:19 +01:00
Laurent Destailleur
3bbb30ccf6
Merge pull request #19257 from aspangaro/14p26 
FIX #19241 Project - Fix display salary in overview
 2021-10-31 14:23:43 +01:00
Laurent Destailleur
ffcc6b6d69
Merge pull request #19235 from noec764/14.0_FIX_Error_in_stock_module 
FIX: Replenish: SQL error when no warehouse has been created
 2021-10-31 14:22:31 +01:00
Laurent Destailleur
13d3ff8ef7
Update replenish.php 2021-10-31 14:22:14 +01:00
Laurent Destailleur
480ad63c5d
Update stocks.lang 2021-10-31 14:21:01 +01:00
Laurent Destailleur
7773f8f017
Update replenish.php 2021-10-31 14:20:30 +01:00
Laurent Destailleur
dfc8698422
Update replenish.php 2021-10-31 14:16:18 +01:00
Laurent Destailleur
f540767095
Merge pull request #19247 from hregis/fix_look_and_feel 
FIX look and feel
 2021-10-31 14:08:56 +01:00
Laurent Destailleur
e4c25a72fb
Merge branch 'develop' into fix_look_and_feel 2021-10-31 14:08:39 +01:00
Laurent Destailleur
ff696e0dad
Merge pull request #19236 from marc-dll/11.0_FIX_invoice_creation_blocked 
FIX: URGENT: impossible to create an invoice
 2021-10-31 14:03:11 +01:00
Laurent Destailleur
3dcd1aa05d
Update info.php 2021-10-31 14:02:34 +01:00
Laurent Destailleur
8dfe4fe05f
Update note.php 2021-10-31 14:02:14 +01:00
Laurent Destailleur
65d59405da
Update document.php 2021-10-31 14:01:56 +01:00
Laurent Destailleur
0e2e8fe27f
Update contact.php 2021-10-31 14:01:40 +01:00
Laurent Destailleur
0d1f67145e
Merge pull request #19237 from ksar-ksar/patch-10 
FIX #19214 : PostgreSQL error on admin/limits.php
 2021-10-31 14:00:13 +01:00
Laurent Destailleur
c1a046601c
Merge pull request #19238 from FHenry/14_fix_deltesuppierorder 
fix: warning on delete supplier order
 2021-10-31 13:58:52 +01:00
Laurent Destailleur
4e32859bc3
Merge pull request #19243 from yaroslaw74/patch-1 
Requisites
 2021-10-31 13:58:25 +01:00
Laurent Destailleur
27d9ee9fc0
Merge pull request #19240 from frederic34/patch-15 
fix warnings
 2021-10-31 13:56:54 +01:00
Laurent Destailleur
6054e23b4d
Merge pull request #19252 from hregis/fix_totalarray_is_overwritten 
FIX $totalarray is overwritten, totals were lost
 2021-10-31 13:56:37 +01:00
Laurent Destailleur
92f9f3179e
Update list.php 2021-10-31 13:56:19 +01:00
Laurent Destailleur
7232e38dbe
Merge pull request #19248 from fmarcet/12.0 
Fix: Import don't work if extrafield is separator
 2021-10-31 13:54:31 +01:00
Laurent Destailleur
f2c282305e
Merge pull request #19260 from aspangaro/12p21 
FIX Ticket - Duplicate field project when we create ticket from project
 2021-10-31 13:53:58 +01:00
Laurent Destailleur
a70e7c7bb2
Merge pull request #19253 from grandoc/new_branch_30_10_2021 
fixes to be pure markdown
 2021-10-31 13:43:03 +01:00
Laurent Destailleur
ed9f0c4ad9 Fix labels 2021-10-31 13:42:08 +01:00
Laurent Destailleur
598508af41
Merge pull request #19261 from aspangaro/15a29 
Clean module HRM
 2021-10-31 13:39:10 +01:00
Laurent Destailleur
dcc98b6026 Fix filter on product on statistic page 2021-10-31 12:54:08 +01:00
Alexandre SPANGARO
57a479e328 Remove useless language key 2021-10-31 07:27:37 +01:00
Alexandre SPANGARO
70ed633171 Update label perms 2021-10-31 07:23:34 +01:00
Alexandre SPANGARO
84c3c9d025 Remove useless language key 2021-10-31 07:12:26 +01:00
Alexandre SPANGARO
62ce27886b Remove useless language key 2021-10-31 07:04:31 +01:00
Alexandre SPANGARO
3242400855 Clean module HRM 2021-10-31 06:26:41 +01:00
Alexandre SPANGARO
54b81312b5 FIX Ticket - Duplicate field project when we create ticket from project 2021-10-30 22:49:32 +02:00
Alexandre SPANGARO
9142599ea5 copyright 2021-10-30 21:18:52 +02:00
Alexandre SPANGARO
b1c799ee08 FIX #19241 Project - Fix display salary in overview 2021-10-30 21:17:15 +02:00
Laurent Destailleur
0017c15974 Debug v15 2021-10-30 17:19:46 +02:00
Laurent Destailleur
47c131af74 Fix regression 2021-10-30 14:10:55 +02:00
Philippe GRAND
5f09f11a67 fixes to be pure markdown 2021-10-30 12:25:40 +02:00
Philippe GRAND
466f064d9a fixes to be pure markdown 2021-10-30 12:08:32 +02:00
Regis Houssin
09621af54e FIX $totalarray is overwritten, totals were lost 2021-10-29 22:49:29 +02:00