Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-25 02:41:26 +01:00
Code Issues Packages Projects Releases Wiki Activity
60,400 Commits 36 Branches 191 Tags
340203cc18a08d39b255058aef47bc40ce2ad708
Commit Graph

7003 Commits

Author SHA1 Message Date
Laurent Destailleur
5207b84e8b Fix compatibility with indian IGST/CSGST/SGST 2017-07-22 01:56:38 +02:00
Laurent Destailleur
5e1dbdc608 Update index.php 2017-07-18 14:35:11 +02:00
Articoder InfoSec Team
0179160f6c Reason: similar change is present elsewhere in the code 
Notes: please review carefully before accepting. patch propagation. manual test run. 
Reviewed By: https://github.com/dchichkov 
Cherry picked from:
===
From 0d62bd704e Mon Sep 17 00:00:00 2001
From: Juanjo Menent <jmenent@2byte.es>
Date: Wed, 22 Jun 2016 18:59:51 +0200
Subject: [PATCH] Fix: Bad column totalizing if MAIN_SHOW_HT_ON_SUMMARY activated
 2017-07-18 14:34:57 +02:00
Laurent Destailleur
84d76f26f2 Fix missing picto 2017-07-15 21:55:05 +02:00
Laurent Destailleur
3cd21ee659 Fix sort order 2017-07-15 21:19:39 +02:00
Laurent Destailleur
bab963ec07 FIX Pagination on the ledger page. 2017-07-15 19:19:12 +02:00
Laurent Destailleur
1735a649e9 Fix permission on salary module 2017-07-15 13:02:41 +02:00
Laurent Destailleur
ab6646d16b Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/accountancy/journal/bankjournal.php
	htdocs/compta/bank/bankentries.php
	htdocs/install/mysql/migration/4.0.0-5.0.0.sql
 2017-07-15 03:54:50 +02:00
Laurent Destailleur
cb87b314be FIX Maxi debug of journalization of bank journal. 2017-07-15 03:41:07 +02:00
Laurent Destailleur
24ecd48b22 Minor fix 2017-07-15 03:40:37 +02:00
Laurent Destailleur
e551c0a665 Fix autofill of amount on supplier payment page 2017-07-14 15:22:30 +02:00
Laurent Destailleur
3db7bd7624 Fix look and feel v6 2017-07-13 17:44:12 +02:00
Laurent Destailleur
2b77c9b5c7 FIX #7050 2017-07-13 16:56:36 +02:00
Laurent Destailleur
2870798d07 Fix remove warnings 2017-07-13 00:35:10 +02:00
Laurent Dinclaux
253f7e252d Fixes local taxes repports by rate 2017-07-10 13:15:14 +11:00
Laurent Destailleur
f40afcf023 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/accountancy/class/bookkeeping.class.php
	htdocs/compta/facture/list.php
	htdocs/compta/paiement/class/cpaiement.class.php
	htdocs/compta/sociales/card.php
	htdocs/core/lib/functions.lib.php
	htdocs/expensereport/card.php
	htdocs/expensereport/class/expensereport.class.php
	htdocs/product/stats/facture.php
 2017-07-08 18:32:34 +02:00
Laurent Destailleur
1d35c87c18 Merge pull request #7125 from aspangaro/6.0-fec3 
Fix some problems
 2017-07-07 20:32:27 +02:00
Laurent Destailleur
34d0c79e32 Merge pull request #7124 from fappels/develop_updateline_notriggerflag 
New add trigger disable to updateline functions
 2017-07-07 20:30:04 +02:00
Laurent Destailleur
749e5eb7f4 Fix link 2017-07-07 20:24:39 +02:00
Laurent Destailleur
552031799d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-07-07 19:42:37 +02:00
Laurent Destailleur
b7af0cca63 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/holiday/card.php
 2017-07-07 19:39:57 +02:00
Laurent Destailleur
a026e1d701 Close #7095 2017-07-07 19:32:03 +02:00
Laurent Destailleur
c459d3aa7a FIX user that modify not set 2017-07-07 19:23:19 +02:00
Laurent Destailleur
fd5f992be4 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2017-07-07 19:15:18 +02:00
Laurent Destailleur
4c1b485d47 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 
Conflicts:
	htdocs/compta/facture/list.php
 2017-07-07 19:06:25 +02:00
Laurent Destailleur
d58682c574 Merge pull request #7088 from atm-arnaud/FIX_edit_social_emptying_label 
FIX edit sociale was emptying label
 2017-07-07 18:59:10 +02:00
florian HENRY
1c647e2898 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2017-07-07 15:59:41 +02:00
Laurent Destailleur
252d8da8fc Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/categories/class/categorie.class.php
	htdocs/core/class/commondocgenerator.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/modules/DolibarrModules.class.php
	htdocs/filefunc.inc.php
	htdocs/societe/class/societe.class.php
	htdocs/supplier_proposal/class/supplier_proposal.class.php
 2017-07-07 15:11:53 +02:00
Alexandre SPANGARO
0c5febfb4d Fix: Accountancy 2017-07-07 06:09:49 +02:00
fappels
6effcb0829 New add trigger disable to updateline functions 2017-07-06 16:26:15 +02:00
florian HENRY
7f869b4840 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/accountancy/class/accountancycategory.class.php
 2017-07-03 14:36:50 +02:00
Laurent Destailleur
7ae52d843c Look and feel v6 2017-07-01 14:23:24 +02:00
Laurent Destailleur
31fe8ebcee Debug v6 2017-07-01 02:22:08 +02:00
arnaud
ca6ce2ba8b FIX status were wrong on product referent list 2017-06-30 10:38:54 +02:00
arnaud
f79b72f724 FIX edit sociale was emptying label 2017-06-29 16:57:30 +02:00
florian HENRY
6e8c83b2a9 fix class error (given by eclipse Oxygen version) 2017-06-29 15:47:33 +02:00
Laurent Destailleur
6f82837b0f Fix GETPOST of lang_id 2017-06-27 17:27:01 +02:00
arnaud
65b9b70ff8 FIX invoice page list 2017-06-27 15:23:51 +02:00
John
93477c102f FIX delete linked element on facture rec 2017-06-26 15:44:04 +02:00
Juan Bautista Mesa Roldán
0f5dc90bae Fixing pages warning when value is null 2017-06-24 16:45:45 +02:00
Laurent Destailleur
534ec0d44a Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/bank/bankentries.php
 2017-06-24 16:26:29 +02:00
Laurent Destailleur
e79f3715b4 FIX #7048 #6075 2017-06-24 16:21:25 +02:00
Laurent Destailleur
a05bbd651c Fix translation 2017-06-23 11:09:29 +02:00
Laurent Destailleur
ecae2fc6b6 Fix translation 2017-06-23 11:08:49 +02:00
Laurent Destailleur
d78d5d60c4 Fix pgsql 
Fix missing vat rate info.
 2017-06-20 01:45:44 +02:00
Laurent Destailleur
cffb368bbd Merge pull request #7030 from aspangaro/6.0-fec3 
Fix : Accountancy - Debug and add information in database
 2017-06-19 15:02:30 +02:00
Laurent Destailleur
bb2d27280b Fix sort link must be disabled for computed field 2017-06-19 14:31:08 +02:00
Alexandre SPANGARO
a4de12dd8d Merge remote-tracking branch 'uptream/develop' into 6.0-fec3 2017-06-18 22:15:36 +02:00
Laurent Destailleur
86a6a83647 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/admin/tools/index.php
	htdocs/bookmarks/bookmarks.lib.php
	htdocs/compta/facture.php
	htdocs/core/tpl/passwordforgotten.tpl.php
	htdocs/fourn/ajax/getSupplierPrices.php
	htdocs/main.inc.php
	htdocs/product/stats/card.php
	htdocs/public/paypal/paymentko.php
 2017-06-18 21:13:48 +02:00
Alexandre SPANGARO
b240f536b5 Fix : Accountancy - Debug and add information in database 2017-06-17 07:54:35 +02:00