Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-13 21:11:31 +01:00
Code Issues Packages Projects Releases Wiki Activity
85,792 Commits 36 Branches 190 Tags
4a8173f498b4a95366263fcc4751ccad1778d96d
Commit Graph

4799 Commits

Author SHA1 Message Date
Laurent Destailleur
3101f72b5c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-04-22 18:28:59 +02:00
Laurent Destailleur
39c454d07b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/modFournisseur.class.php
 2020-04-22 18:28:52 +02:00
Laurent Destailleur
bbfb93bc42 Merge pull request #13690 from OPEN-DSI/new-societe-import-update-contacts 
NEW can update contact in import model
 2020-04-22 18:09:49 +02:00
Laurent Destailleur
c1d0cae24d Merge pull request #13692 from hregis/11.0_bug 
FIX missing fk_bank during export of suppliers invoices
 2020-04-22 13:18:46 +02:00
Regis Houssin
f6f9ca48dd FIX missing fk_bank during export of suppliers invoices 2020-04-22 12:23:26 +02:00
florian HENRY
8be14060d6 fix: avoid php notice 2020-04-22 12:08:05 +02:00
VESSILLER
cce3085a79 NEW can update contact in import model 2020-04-22 10:44:23 +02:00
Frédéric FRANCE
8f42707220 Update pdf_crabe.modules.php 2020-04-21 23:20:11 +02:00
Frédéric FRANCE
7972a35e36 Update pdf_azur.modules.php 2020-04-21 23:12:12 +02:00
Frédéric FRANCE
2fde77703d add extrafields in note for enstein 2020-04-21 23:06:41 +02:00
Laurent Destailleur
770fca0b33 Debug the double language feature in pdf 2020-04-21 20:16:36 +02:00
Laurent Destailleur
cadb52c5b3 Look and feel v12 2020-04-20 19:39:34 +02:00
Laurent Destailleur
230fe26b58 Look and feel v12 2020-04-20 18:38:25 +02:00
Laurent Destailleur
40b3db940c Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-04-20 14:44:36 +02:00
Frédéric FRANCE
7b68a2a60e Update pdf_crabe.modules.php 2020-04-19 21:50:52 +02:00
Laurent Destailleur
3e7f0b364e FIX #13611 2020-04-17 10:22:08 +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
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
984fa0d5a0 Fix hidden const 2020-04-16 15:24:12 +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
43ec6c3ae5 Fix phpcs 2020-04-15 23:38:14 +02:00
Laurent Destailleur
3be426be5b Align sponge and crabe 2020-04-15 02:24:08 +02:00
Laurent Destailleur
1dd951495b Removed hard coded dependency on an external module 2020-04-15 02:20:57 +02:00
Laurent Destailleur
c337bd91fe Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-04-14 21:58:13 +02:00
Laurent Destailleur
d143bd8aec FIX #13589 missing price_level in import of thirdparties 2020-04-14 21:22:08 +02:00
ATM john
b70cd84402 Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_new_extend_retained_warranty 2020-04-14 14:11:12 +02:00
Laurent Destailleur
8c8a8263dd Merge branch 'develop' into patch-145 2020-04-13 16:22:19 +02:00
Laurent Destailleur
99cbb273c8 Update pdf_crabe.modules.php 2020-04-13 16:21:47 +02:00
Laurent Destailleur
e02ac3b518 Trans 2020-04-13 15:57:25 +02:00
Laurent Destailleur
96d087c99d Fix clean event report 2020-04-13 02:59:33 +02:00
Laurent Destailleur
d503c1b6be Fix help 2020-04-12 23:18:21 +02:00
Laurent Destailleur
5b8864b46e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
 2020-04-12 21:41:40 +02:00
Laurent Destailleur
549b126eff Look and feel v12 2020-04-12 21:36:57 +02:00
Laurent Destailleur
08301e2696 Merge pull request #13567 from atm-maxime/new_expensereport_tab_remove 
Remove expense report tab from user
 2020-04-12 17:11:37 +02:00
Laurent Destailleur
d7784887d1 More font awesome picto 2020-04-12 14:58:50 +02:00
Maxime Kohlhaas
2ef787c7ff Remove expense report tab from user 2020-04-11 17:38:54 +02:00
simicar29
9573f1289a FIX #7594 
This is a temptative fix of the bad "multi page break" in expense report
 2020-04-11 13:42:37 +02:00
Laurent Destailleur
db30f0bbc4 NEW Receipt printer module moved from 'development' to 'experimental' 2020-04-11 00:56:18 +02:00
Laurent Destailleur
5ff981bf61 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/user/perms.php
 2020-04-10 12:04:21 +02:00
Laurent Destailleur
874cbcefc7 Fix permission to close a proposal or order was not correctly used 
#13547
 2020-04-10 11:54:14 +02:00
Scrutinizer Auto-Fixer
444c293c01 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-04-10 08:59:32 +00:00
Laurent Destailleur
83af4ebea4 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
	htdocs/product/stock/class/entrepot.class.php
	htdocs/product/stock/list.php
 2020-04-10 01:22:22 +02:00
Francis Appels
0a8a8bafa0 FIX print pictures in shipment docs 2020-04-09 15:40:36 +02:00
Laurent Destailleur
361baa0c73 CSS 2020-04-08 17:56:24 +02:00
Laurent Destailleur
02436c1e84 NEW The module selection uses a KanBan view by default. 2020-04-08 17:04:23 +02:00
Laurent Destailleur
7514aa4612 Merge pull request #13506 from joseplluis/patch-6 
NEW add professional ID 1 in sepamandate document
 2020-04-08 14:40:38 +02:00
Laurent Destailleur
0716951b6d Fix logo 2020-04-08 13:38:29 +02:00
Laurent Destailleur
9d9364256b More picto using fontawesome. 2020-04-07 16:45:08 +02:00
Laurent Destailleur
809c741d11 Can use font awesome as picto of object and modules. 2020-04-06 15:34:28 +02:00