Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-13 19:25:22 +01:00
Code Issues Packages Projects Releases Wiki Activity
66,354 Commits 39 Branches 191 Tags
514b1116b7c67f763bf6a9cb14f85c3ac2b50ec6
Commit Graph

66354 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
514b1116b7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-15 11:28:05 +02:00
Laurent Destailleur
f9382ce395 Upgrade octicons 2018-04-15 11:27:39 +02:00
Laurent Destailleur
dbfee8117d Merge pull request #8597 from atm-florian/dev_uniformcode 
fix syntax and uniformize code
 2018-04-15 11:26:18 +02:00
Laurent Destailleur
9a018cba1c Merge pull request #8599 from grandoc/new_branch_15_04_2018 
fix typo
 2018-04-15 11:22:56 +02:00
Philippe GRAND
0a6bcb2a39 fix typo and translation 2018-04-15 07:37:23 +02:00
Philippe GRAND
7943a19402 fix typo 2018-04-15 07:07:04 +02:00
Laurent Destailleur
db385d64b6 Fix br 2018-04-14 23:24:01 +02:00
Laurent Destailleur
ffffd848a9 Look and feel v8 2018-04-14 22:34:46 +02:00
Laurent Destailleur
92d8867b6e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2018-04-14 22:24:47 +02:00
Laurent Destailleur
187cc35786 Look and feel v8 2018-04-14 22:23:56 +02:00
Laurent Destailleur
fdbeb4265a Look and feel v8 2018-04-14 22:22:29 +02:00
Laurent Destailleur
77b686500c css 2018-04-14 21:07:20 +02:00
florian HENRY
ad403c7045 fix syntax and uniformize code 2018-04-14 17:04:38 +02:00
Laurent Destailleur
2f0780a51f csss 2018-04-14 15:53:58 +02:00
Laurent Destailleur
96ef9802df css 2018-04-14 15:44:57 +02:00
Laurent Destailleur
fea3182e93 NEW Can filter on account range in general ledger grouped by account 2018-04-14 00:01:54 +02:00
Laurent Destailleur
b4ef3945d2 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/facture/card.php
 2018-04-13 23:52:08 +02:00
Laurent Destailleur
6cdb801ed8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-13 23:50:12 +02:00
Laurent Destailleur
d833620285 Fix title of break in balance account report 2018-04-13 23:49:08 +02:00
Laurent Destailleur
f84b74f4cc Merge pull request #8583 from hregis/develop_ldap 
NEW add "printUserPasswordField" hooks
 2018-04-13 23:36:20 +02:00
Laurent Destailleur
1ef8484abf Merge pull request #8589 from atm-quentin/develop 
NEW OnSearchAndListGoOnCustomerOrSupplierCard conf
 2018-04-13 23:30:30 +02:00
Laurent Destailleur
c6f57b8ec4 Update societe.php 2018-04-13 23:29:47 +02:00
Laurent Destailleur
6a3c2f9808 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/fourn/facture/card.php
 2018-04-13 23:27:14 +02:00
Laurent Destailleur
50a3b73a6f Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-04-13 23:21:29 +02:00
Laurent Destailleur
3ec295935c Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-04-13 23:21:18 +02:00
Laurent Destailleur
ecdb56606d Merge pull request #8590 from atm-greg/FIX_supplier_invoice_line_rank 
Rank of invoice_supplier lines was always -1
 2018-04-13 23:20:42 +02:00
Laurent Destailleur
c25e21de4b Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-13 23:19:22 +02:00
Laurent Destailleur
ecfabc6633 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/core/lib/functions.lib.php
 2018-04-13 23:18:39 +02:00
Laurent Destailleur
a0e243a29b Clean code 2018-04-13 23:11:19 +02:00
Laurent Destailleur
53dd3a3e94 Merge pull request #8588 from fappels/develop-ecmfiles 
NEW Add triggers on ECM object and add fill src_object_type/id fields
 2018-04-13 23:09:16 +02:00
Laurent Destailleur
c4076fc8bd Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-04-13 23:08:34 +02:00
Laurent Destailleur
93ea46c58c Merge branch 'develop' into develop-ecmfiles 2018-04-13 23:08:26 +02:00
Laurent Destailleur
8cfcdabcac Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
 2018-04-13 23:03:46 +02:00
Laurent Destailleur
ab720abca2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-13 22:57:57 +02:00
Laurent Destailleur
a933e458e7 Repair type of product in invoice table from type of product 2018-04-13 22:57:43 +02:00
Laurent Destailleur
e1bd605604 Merge pull request #8587 from atm-greg/Fix_specialcode_on_supplier_doc_lines 
Fix specialcode on order_supplier doc lines
 2018-04-13 22:24:04 +02:00
Laurent Destailleur
12b5070d23 Merge pull request #8586 from hregis/develop_bug5 
Fix: avoid Warning: Creating default object from empty value
 2018-04-13 22:23:20 +02:00
Laurent Destailleur
3b202b2255 Merge branch 'develop' into develop_bug5 2018-04-13 22:23:14 +02:00
Laurent Destailleur
235bf2a961 Merge pull request #8591 from hregis/7.0_bug6 
FIX avoid focus problem when select2 is in a modal dialog window
 2018-04-13 22:22:24 +02:00
Laurent Destailleur
374a0723bf Fix VAT report by rate 2018-04-13 22:20:14 +02:00
Regis Houssin
556a418132 Fix: best method 2018-04-13 19:30:11 +02:00
Laurent Destailleur
32ff8ae132 Fix link 2018-04-13 18:02:25 +02:00
Laurent Destailleur
6f91b8019f Remove warnings 2018-04-13 17:54:27 +02:00
Regis Houssin
199bf4c044 Fix: avoid focus problem when select2 is in a modal dialog window 2018-04-13 17:10:07 +02:00
Laurent Destailleur
300d6962d9 Fix step5 upgrade process 2018-04-13 17:05:35 +02:00
atm-greg
4fae1e3236 rank of invoice_supplier lines was always -1 2018-04-13 17:01:10 +02:00
fappels
e054d1ae8d Try to fix travis 2018-04-13 16:49:03 +02:00
Laurent Destailleur
4251748aca Clean code 2018-04-13 16:18:33 +02:00
atm-greg
8d4126274a rang was missing on order_supplier lines 2018-04-13 15:53:49 +02:00
atm-quentin
ba5ac47602 NEW OnSearchAndListGoOnCustomerOrSupplierCard conf 2018-04-13 15:48:58 +02:00