Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-18 15:31:28 +01:00
Code Issues Packages Projects Releases Wiki Activity
72,480 Commits 36 Branches 190 Tags
84ec39f043c3d807519b8e4cb1570a01eb47d848
Commit Graph

72480 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
6275355cd5 Merge pull request #10234 from aspangaro/7.0_alert_bank 
Fix: Accountancy - remove alert on bank account configuration when bank account is closed
 2018-12-16 17:41:23 +01:00
Laurent Destailleur
9558020ea3 Merge pull request #10233 from simnandez/8.0 
FIX: Vendor translations are in english
 2018-12-16 17:40:37 +01:00
Laurent Destailleur
e5e4ef7b8c Work on cash fence 2018-12-16 16:47:09 +01:00
Laurent Destailleur
e366d7d57c Work on cash fence 2018-12-16 15:30:31 +01:00
Laurent Destailleur
988ba172ae Clean code of POS modules 2018-12-16 14:59:51 +01:00
Laurent Destailleur
e14b426985 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/exports/export.php
 2018-12-16 13:39:16 +01:00
Laurent Destailleur
cca3b4870a FIX CVE-2018-19799 2018-12-16 13:36:51 +01:00
Laurent Destailleur
699766223f Fix phpcs 2018-12-16 13:00:24 +01:00
Juanjo Menent
a61677dcc6 Merge remote-tracking branch 'upstream/7.0' into 7.0 2018-12-16 11:31:06 +01:00
Juanjo Menent
6ce0d3e279 FIX: Vendor translations are in english 2018-12-16 11:16:12 +01:00
Alexandre SPANGARO
6eb9013430 Fix: Accountancy - remove alert on bank account configuration when bank account is closed 2018-12-16 06:36:55 +01:00
Alexandre SPANGARO
8148ea8361 Revert "Fix: Problem with loan integration in general ledger" 
This reverts commit 50da3c2ed2.
 2018-12-16 06:16:14 +01:00
Alexandre SPANGARO
df8aaf9c06 Merge branch '9.0' of https://github.com/Dolibarr/dolibarr into 9.0 2018-12-16 06:14:55 +01:00
Alexandre SPANGARO
50da3c2ed2 Fix: Problem with loan integration in general ledger 2018-12-16 06:14:33 +01:00
Laurent Destailleur
a601859985 Work on cash fence 2018-12-15 19:58:43 +01:00
Laurent Destailleur
2bfc5fe235 Work on cash fence 2018-12-15 19:56:08 +01:00
Laurent Destailleur
1c49599a47 Work on cash fence feature 2018-12-15 19:46:51 +01:00
Laurent Destailleur
0451eb741b Work on legal cash fence 2018-12-15 19:20:30 +01:00
Laurent Destailleur
8ce6f67773 Fix phpcs 2018-12-15 18:27:38 +01:00
Laurent Destailleur
944f9ac894 Typo 2018-12-15 18:14:08 +01:00
Laurent Destailleur
527ad04ae8 FIX Mandatory field feature should works on textarea 
Conflicts:
	htdocs/core/lib/functions.lib.php
 2018-12-15 18:13:30 +01:00
Laurent Destailleur
33a91ff707 Add missing POS closure feature 2018-12-15 16:47:06 +01:00
andreubisquerra
cdaf048766 First CashControl version 2018-12-15 16:45:36 +01:00
Norbert Penel
0f3a063c91 Events are not linked to products 
when created from a product card, the events are not linked to the product
 2018-12-15 15:57:15 +01:00
Laurent Destailleur
db46d82de3 Fix position of menu entries 2018-12-15 15:35:59 +01:00
Laurent Destailleur
6846d8821d Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/core/tpl/extrafields_list_search_sql.tpl.php
 2018-12-15 14:07:25 +01:00
Laurent Destailleur
72b44a9a32 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-12-15 14:05:48 +01:00
Laurent Destailleur
2a3b808da6 CSS 2018-12-15 14:05:23 +01:00
Laurent Destailleur
e069da69ba Revert "Fix screen size fall" 
This reverts commit abb6b41f91.
 2018-12-15 12:35:37 +01:00
Laurent Destailleur
dbe5d285e8 Merge pull request #9965 from atm-john/fix_responsive 
FIX screen size fall
 2018-12-15 12:33:35 +01:00
Laurent Destailleur
8e08ea5c14 Merge pull request #10143 from atm-florian/8.0_fix9964 
8.0 fix #9964
 2018-12-14 19:40:53 +01:00
Laurent Destailleur
063e589a1b Merge branch '8.0' into 8.0_fix9964 2018-12-14 19:37:40 +01:00
Laurent Destailleur
45115a9590 Merge pull request #10191 from fappels/7.0_fix_issue#10186 
Fix issue #10186 no display of stock per batch series.
 2018-12-14 19:34:11 +01:00
Laurent Destailleur
ea35e45f76 Merge pull request #10197 from atm-maxime/fix_import_bank 
Fix unexistant fields
 2018-12-14 17:40:45 +01:00
Laurent Destailleur
abd09ae631 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2018-12-14 17:24:17 +01:00
PMickael
37daface19 [Accounting][VAT] Fix balance should be based on period 
[Accounting][VAT] Fix balance should be based on period
 2018-12-14 17:23:45 +01:00
Laurent Destailleur
962c19d33c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2018-12-14 11:27:29 +01:00
Laurent Destailleur
539e2c55cd FIX #9629 #9625 2018-12-14 10:33:07 +01:00
Laurent Destailleur
c1ce902f91 FIX #9629 #9625 2018-12-14 10:31:09 +01:00
Laurent Destailleur
e5b8b649aa Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2018-12-13 20:50:08 +01:00
Laurent Destailleur
5dabefe227 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2018-12-13 20:49:55 +01:00
Laurent Destailleur
735d04bd2a Merge 2018-12-13 20:48:07 +01:00
Laurent Destailleur
dcb43214d6 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-12-13 20:46:05 +01:00
Laurent Destailleur
7a3ab13196 FIX #10183 using backport of fix done in 9.0 2018-12-13 20:45:51 +01:00
Laurent Destailleur
bab0557f29 Merge pull request #10207 from frederic34/patch-9 
add badge for 9.0
 2018-12-13 20:03:11 +01:00
Laurent Destailleur
603656c7de Merge pull request #10219 from simnandez/8.0 
FIX: #10218 Bad redirection after deleting a user or group
 2018-12-13 20:02:53 +01:00
Laurent Destailleur
4413b2e886 Merge pull request #10215 from atm-quentin/8.0_FIX_if_qty_is_0 
FIX if qty is 0
 2018-12-13 19:56:38 +01:00
Laurent Destailleur
6ad106d14a Update fournisseur.facture.class.php 2018-12-13 19:56:22 +01:00
florian HENRY
2e57a8be51 better fix 2018-12-13 12:37:40 +01:00
florian HENRY
56923caeec Merge branch '8.0' of https://github.com/Dolibarr/dolibarr.git into 8.0_fix9964 2018-12-13 12:34:39 +01:00