lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
90,110 Commits 43 Branches 150 Tags 886 MiB
099c19cefb
Commit Graph

90110 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
ea60d0be63 FIX #13618 2020-04-17 10:27:38 +02:00
Laurent Destailleur
3e7f0b364e FIX #13611 2020-04-17 10:22:08 +02:00
Tobias Sekan
b22b5603b8
Merge pull request #17 from Dolibarr/develop 
pull from develop
 2020-04-17 09:19:10 +02:00
Laurent Destailleur
15e3601336 Fix str_replace 2020-04-17 00:49:22 +02:00
Laurent Destailleur
d4c18c79fb Add option WEBSITE_ADD_CSS_TO_BODY to add a CSS on body tag 2020-04-17 00:42:01 +02:00
ATM john
3b4b30ea57 Fix merge remaining lines 2020-04-16 20:33:53 +02:00
ATM john
c334a931de Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_new_extend_retained_warranty 2020-04-16 20:29:54 +02:00
Laurent Destailleur
619014726e Fix char of account of us 2020-04-16 17:19:18 +02:00
Laurent Destailleur
231c1ba9c1
Merge pull request #13614 from Fred-Zweig/develop 
Added basic charts of accounts for USA and Canada.
 2020-04-16 16:15:28 +02:00
Laurent Destailleur
7b222ec299
Merge pull request #13639 from aspangaro/12.0_a26 
Fix : Accountancy - Error on buy accountancy account suggest
 2020-04-16 16:15:07 +02:00
Alexandre SPANGARO
b607c83b8a Fix : Accountancy - Error on buy accountancy account suggest 2020-04-16 16:13:52 +02:00
Laurent Destailleur
d176840bfb Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-04-16 16:02:28 +02:00
Laurent Destailleur
3c29a7b8d8 Fix phpcs 2020-04-16 16:02:06 +02:00
Laurent Destailleur
5254a94038 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/ldap.php
	htdocs/commande/class/commande.class.php
	htdocs/commande/index.php
	htdocs/commande/list.php
	htdocs/compta/facture/list.php
	htdocs/expedition/list.php
	htdocs/fourn/commande/list.php
	htdocs/fourn/facture/list.php
	htdocs/loan/list.php
	htdocs/product/class/product.class.php
	htdocs/supplier_proposal/list.php
 2020-04-16 15:58:59 +02:00
Laurent Destailleur
01ec8693f2 Trans 2020-04-16 15:48:05 +02:00
Laurent Destailleur
855ac5467c FIX setup of suggested payment mode on proposals and orders 2020-04-16 15:40:16 +02:00
Laurent Destailleur
26022f062f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-04-16 15:24:23 +02:00
Laurent Destailleur
984fa0d5a0 Fix hidden const 2020-04-16 15:24:12 +02:00
Laurent Destailleur
9eb737d02e Trans 2020-04-16 14:49:27 +02:00
Laurent Destailleur
9c77243d66 Trans 2020-04-16 14:47:23 +02:00
Laurent Destailleur
56996b4aa5 trans 2020-04-16 14:42:08 +02:00
Laurent Destailleur
1d0b532437 Fix css 2020-04-16 14:31:30 +02:00
Pierre Ardoin
19c85785f7
Fix 2020-04-16 13:26:55 +02:00
Laurent Destailleur
803b0eb3bd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-04-16 12:39:45 +02:00
Laurent Destailleur
dd50083a81 Look and feel v12 2020-04-16 12:39:34 +02:00
Pierre Ardoin
e85b4a5a20
FIX Directory Issue with Multicompany 
Before : Cannot show documents added entity who created the product/service

Now : show all files. 

Warning : all products must be generated in $object->entity directory and not in $conf->entity.
 2020-04-16 12:15:41 +02:00
Laurent Destailleur
a13215217e
Merge pull request #13604 from TobiasSekan/FixAtomFeeds 
FIX not working ATOM feeds
 2020-04-16 11:58:49 +02:00
Sekan, Tobias
84f7fe24fe Adress feedback 2020-04-16 10:49:39 +02:00
Tobias Sekan
0c20b6b2d6
Merge pull request #16 from Dolibarr/develop 
pull from develop
 2020-04-16 08:48:19 +02:00
Laurent Destailleur
702f1f1a35
Merge pull request #13627 from ptibogxiv/patch-335 
NEW API filter bankaccounts by category
 2020-04-16 01:02:44 +02:00
Laurent Destailleur
f3de300483
Merge pull request #13626 from ptibogxiv/patch-334 
NEW API filter projects by category
 2020-04-16 01:01:58 +02:00
Laurent Destailleur
c413013db8
Merge pull request #13625 from ptibogxiv/patch-333 
NEW API filter warehouses by categorie
 2020-04-16 01:01:44 +02:00
Laurent Destailleur
5d53415dfc
Merge pull request #13624 from ptibogxiv/patch-332 
NEW API filter members by category
 2020-04-16 01:01:28 +02:00
Laurent Destailleur
9c792060a2
Merge pull request #13623 from ptibogxiv/patch-331 
NEW API filter user by category
 2020-04-16 01:01:04 +02:00
Laurent Destailleur
7d9c10251c
Merge pull request #13622 from ptibogxiv/patch-330 
NEW API filter contacts by category
 2020-04-16 01:00:33 +02:00
Laurent Destailleur
f8b8975811
Merge pull request #13621 from ptibogxiv/patch-329 
NEW API filter thirdpartie by category
 2020-04-16 00:59:50 +02:00
Laurent Destailleur
7f746af10e
Merge pull request #13620 from atm-quentin/FIX_draftordered_replenish 
FIX draftordered replenish virtual stock
 2020-04-16 00:58:23 +02:00
Laurent Destailleur
dd53fcf3ee
Merge pull request #13612 from atm-maxime/new_user_hr_tab 
New add personal email and phone on user card
 2020-04-16 00:54:37 +02:00
Laurent Destailleur
6a5b5d77a8
Merge pull request #13615 from pstructures/pstructures-boolean-addupdatedelete 
Added support for Boolean common field types
 2020-04-16 00:52:54 +02:00
Laurent Destailleur
f7803247ab
Merge pull request #13610 from joseplluis/patch-6 
NEW bank account tags for invoice ODT template
 2020-04-16 00:49:17 +02:00
Laurent Destailleur
b540bb29e0
Merge pull request #13617 from atm-quentin/11.0_viewstatut_to_search_status 
FIX viewstatut to search status
 2020-04-16 00:48:12 +02:00
Laurent Destailleur
8115dea80b
Merge pull request #13631 from Dolibarr/scrutinizer-patch-6 
Scrutinizer Auto-Fixes
 2020-04-16 00:44:02 +02:00
Scrutinizer Auto-Fixer
d021559b16 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-04-15 22:42:57 +00:00
Laurent Destailleur
43c48727e2 Fix var_dump 2020-04-15 23:44:07 +02:00
Laurent Destailleur
43ec6c3ae5 Fix phpcs 2020-04-15 23:38:14 +02:00
Laurent Destailleur
86eaa78f1e FIX Use of image into free text for PDF if DOL_DATA_DIR is outside of 
DOL_DOCUMENT_DIR.
 2020-04-15 20:00:27 +02:00
ptibogxiv
84989c5cf0
Update api_projects.class.php 2020-04-15 19:33:33 +02:00
ptibogxiv
284f269213
Update api_bankaccounts.class.php 2020-04-15 19:32:45 +02:00
stickler-ci
c92263ea77 Fixing style errors. 2020-04-15 17:30:39 +00:00
ptibogxiv
0379f0fa16
NEW API filter projects by category 2020-04-15 19:29:00 +02:00