Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-10 19:41:26 +01:00
Code Issues Packages Projects Releases Wiki Activity
68,347 Commits 36 Branches 190 Tags
b8c88a214449d5129fd4c479249cfa7c2373d10d
Commit Graph

8059 Commits

Author SHA1 Message Date
Laurent Destailleur
07fb29f0c4 Fix var not initialized 2018-03-16 12:18:20 +01:00
Laurent Destailleur
1716ac5f44 Fix var not initialized 2018-03-16 01:05:49 +01:00
Laurent Destailleur
5a397fff72 Fix scrutinizer bugs 2018-03-16 00:16:32 +01:00
Laurent Destailleur
c83b0bd53c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-15 15:11:35 +01:00
Laurent Destailleur
c4ca4a5a16 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/tva/index.php
	htdocs/install/mysql/data/llx_accounting_category.sql
 2018-03-15 15:11:18 +01:00
Laurent Destailleur
c9566e9501 Merge pull request #8392 from aspangaro/8.0-a9 
NEW Add stats in salaries module
 2018-03-15 14:28:35 +01:00
Laurent Destailleur
ce0144e645 Add code to help debug 2018-03-15 13:21:02 +01:00
Laurent Destailleur
542eb2e5f4 Comment 2018-03-15 13:19:29 +01:00
Laurent Destailleur
85e307d6b8 Fix report when group is not dedicated to a country 2018-03-15 12:31:24 +01:00
Laurent Destailleur
b379a2f83c FIX css 2018-03-15 10:43:04 +01:00
Laurent Destailleur
d804764134 Standardize look and feel 2018-03-15 10:41:43 +01:00
Laurent Destailleur
97c8504915 Fix remove log 2018-03-15 10:26:06 +01:00
Alexandre SPANGARO
9ce6ab915c Merge remote-tracking branch 'uptream/develop' into 8.0-a9 2018-03-15 06:24:51 +01:00
Alexandre SPANGARO
5eccc6bcbc NEW Add stats in salaries module 2018-03-15 06:23:20 +01:00
Laurent Destailleur
852bf8dab7 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/card.php
	htdocs/societe/class/societe.class.php
 2018-03-15 01:57:35 +01:00
Laurent Destailleur
4957ea9178 Fix SQLi reported by op7ica 2018-03-15 01:55:16 +01:00
Laurent Destailleur
78b0585798 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/taxes.php
 2018-03-12 19:09:57 +01:00
Laurent Destailleur
98b7d4c2e2 NEW Can set the start/end date of service line in invoice templates 2018-03-12 12:27:40 +01:00
Laurent Destailleur
93f4d6fdcd Translation 2018-03-11 21:34:38 +01:00
Laurent Destailleur
e1654f4215 Fix division by zero 2018-03-11 21:18:18 +01:00
Laurent Destailleur
5c4b5cc74f fix 2018-03-11 00:40:35 +01:00
Laurent Destailleur
897b3f7b79 Fix setup 2018-03-11 00:31:26 +01:00
Laurent Destailleur
390618db47 Fix bad space 2018-03-10 22:42:28 +01:00
Laurent Destailleur
bdb6a09762 Fix phpcs 2018-03-10 22:41:57 +01:00
Laurent Destailleur
dfb3d1b3bc Merge pull request #8325 from inoveaconseil/develop 
Add execution date on direct debit
 2018-03-10 22:11:58 +01:00
Laurent Destailleur
bb835d3633 Update bonprelevement.class.php 2018-03-10 22:09:32 +01:00
Laurent Destailleur
f609547bc9 Update bonprelevement.class.php 2018-03-10 18:50:41 +01:00
Laurent Destailleur
9e0c74ca20 Update bonprelevement.class.php 2018-03-10 18:49:48 +01:00
Laurent Destailleur
b0bd8cf910 Update facture.class.php 2018-03-10 12:56:19 +01:00
Inovea Conseil
d2dff92f26 Add execution date on prelevement 2018-03-10 11:28:12 +01:00
Inovea Conseil
975300b90b Add execution date on prelevement 2018-03-10 11:23:35 +01:00
florian HENRY
40fb803ffd scrunitizer 2018-03-10 09:34:33 +01:00
florian HENRY
63fb53159c fix scrunitizer 2018-03-10 01:12:47 +01:00
florian HENRY
8e84b733dc fix scrutinizer 2018-03-10 00:13:41 +01:00
Laurent Destailleur
20ec269d4d Merge pull request #8318 from atm-florian/7.0_betterthirdpartylink 
7.0 betterthirdpartylink
 2018-03-09 23:03:23 +01:00
Laurent Destailleur
d8d13a7348 Merge branch 'develop' into 7.0_fix_invoicelist 2018-03-09 22:37:20 +01:00
florian HENRY
a34709c112 fix better thirdparty link 2018-03-09 22:36:00 +01:00
florian HENRY
164ca682d5 fix add "late" invoice into "save last search/backtolist" feature 2018-03-09 17:23:43 +01:00
Regis Houssin
82057b3523 Fix: use code instead id 2018-03-09 08:11:02 +01:00
Laurent Destailleur
9f42e1b172 Prepare code to introduce different payment modes than BAN 2018-03-08 22:33:40 +01:00
Laurent Destailleur
1c9e7145e7 Merge pull request #8276 from ATM-Consulting/develop_atm 
NEW: supplier credit notes & discounts (absolute and relative)
 2018-03-08 20:06:37 +01:00
Regis Houssin
861a831e24 Fix: debug 2018-03-08 11:53:46 +01:00
Regis Houssin
fd9c79fa7f Fix: use getEntity if no rowid to compare 2018-03-08 07:42:17 +01:00
Regis Houssin
93a9430e49 Fix: regression, restore primary key 2018-03-08 07:41:54 +01:00
Alexandre SPANGARO
0182b724aa Merge remote-tracking branch 'uptream/develop' into 8.0-a7 2018-03-08 06:53:54 +01:00
Alexandre SPANGARO
3f2aa6a4fb New : On invoice card, show accounting account linked 2018-03-08 06:52:31 +01:00
Laurent Destailleur
69ef6a9316 Fix data on thirdparty tooltip 2018-03-07 19:13:54 +01:00
Laurent Destailleur
fe45e82e99 Fix use of table llx_c_paiement (param showempty was not used/set) 2018-03-07 19:00:38 +01:00
Laurent Destailleur
65c689cc81 Clean code 2018-03-07 18:32:47 +01:00
Laurent Destailleur
3287c03e67 Fix data on thirdparty tooltip 2018-03-07 18:32:25 +01:00