lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
60,445 Commits 43 Branches 150 Tags 886 MiB
cfe445ab14
Commit Graph

52469 Commits

Author SHA1 Message Date
Laurent Destailleur
cfe445ab14 Code comment 2017-07-25 13:28:56 +02:00
Laurent Destailleur
cba898e2b9 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/compta/facture.php
 2017-07-25 10:12:28 +02:00
Laurent Destailleur
fdcc067c23 Fix regression. Restore lost link "Other invoices". 2017-07-25 10:02:56 +02:00
Laurent Destailleur
9043249740 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/commande/list.php
	htdocs/contrat/list.php
	htdocs/contrat/services.php
	htdocs/fourn/facture/list.php
 2017-07-25 09:54:17 +02:00
Laurent Destailleur
aa9b4ce1f3 Fix too long combo for tags 2017-07-25 09:49:08 +02:00
Laurent Destailleur
aff61fad7d Fix new generic classes system 2017-07-25 01:21:20 +02:00
Laurent Destailleur
307b8ef4f6 Debug modulebuilder 2017-07-25 00:32:06 +02:00
Laurent Destailleur
e571616d52 Debug modulebuilder 2017-07-25 00:21:01 +02:00
Laurent Destailleur
b50236da4c Fix dir created at install 2017-07-25 00:07:17 +02:00
Laurent Destailleur
4ae60284fb Debug modulebuilder 2017-07-25 00:03:29 +02:00
Laurent Destailleur
8303cee676 Debug modulebuilder 2017-07-24 21:03:35 +02:00
Laurent Destailleur
dcb79e66cc Debug modulebuilder 2017-07-24 13:55:12 +02:00
Laurent Destailleur
9043cf759b Fix clone function 2017-07-23 20:27:30 +02:00
Laurent Destailleur
25b107defb Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/contrat/list.php
	htdocs/fichinter/list.php
 2017-07-23 19:09:00 +02:00
Laurent Destailleur
0aed9ecd7c Fix ckeditor is now ok since there is no more jmobile. 2017-07-23 18:52:30 +02:00
Laurent Destailleur
7904e994a7 FIX When disconnected, the search box jump to login instead of error. 2017-07-22 23:43:40 +02:00
Laurent Destailleur
583452114b Split editor in 2 (html source and wysiwyg) 2017-07-22 20:19:10 +02:00
Laurent Destailleur
2a133f4a3f Generate table for extrafields 2017-07-22 20:12:00 +02:00
Laurent Destailleur
9e6666e511 Fix translation keys for taxes 2017-07-22 16:40:19 +02:00
Laurent Destailleur
6470b62f56 Fix bad rounding 2017-07-22 16:13:21 +02:00
Laurent Destailleur
340203cc18 Fix vat label for India 2017-07-22 16:05:51 +02:00
Laurent Destailleur
44023606c6 Fix pb in dolGetFirstLineOfText. Add PHPunit 2017-07-22 12:47:35 +02:00
Laurent Destailleur
a0d9890c99 Fix packager 2017-07-22 02:31:06 +02:00
Laurent Destailleur
5207b84e8b Fix compatibility with indian IGST/CSGST/SGST 2017-07-22 01:56:38 +02:00
Laurent Destailleur
ba43c41ac0 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2017-07-22 01:21:40 +02:00
Laurent Destailleur
7562412554 Minor fixes 2017-07-22 01:21:28 +02:00
Laurent Destailleur
f64a9968a9 Debug modulebuilder 2017-07-22 01:00:43 +02:00
Laurent Destailleur
83341cc3ed Merge pull request #7181 from atm-john/FIX_extrafield_update_into_contract 
Fix extrafield doesnt save on update
 2017-07-21 15:02:10 +02:00
Laurent Destailleur
6830fe4f91 Fix generic clone function 2017-07-21 13:39:06 +02:00
Laurent Destailleur
5318e513c1 Debug module website 2017-07-21 02:29:24 +02:00
Laurent Destailleur
fa3ed50f3a Fix sql syntax 2017-07-20 18:23:42 +02:00
Laurent Destailleur
3b8f60f90e Fix pb of recursive include in website module 2017-07-20 16:49:20 +02:00
John
f438097ecb Fix extrafield save on update 2017-07-20 15:06:53 +02:00
Laurent Destailleur
84f621fde3 Fix migration on pgsql 2017-07-19 16:31:15 +02:00
Laurent Destailleur
74db61ce15 Fix translation 2017-07-19 15:50:57 +02:00
Laurent Destailleur
1c5148bb1e Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2017-07-18 15:13:46 +02:00
Laurent Destailleur
6e77dab832 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-07-18 15:13:15 +02:00
Laurent Destailleur
7e1d282b1b Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2017-07-18 15:12:28 +02:00
Laurent Destailleur
e41b98b5d4 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 2017-07-18 15:12:03 +02:00
Laurent Destailleur
98cb1b7af1 Merge pull request #7171 from atm-ph/fix_5.0_search_lost 
Fix lost search value in list if come from thirdparty card
 2017-07-18 14:48:38 +02:00
Laurent Destailleur
f6060b976d Update list.php 2017-07-18 14:48:18 +02:00
Laurent Destailleur
7ac5054df8 Update list.php 2017-07-18 14:47:44 +02:00
Laurent Destailleur
594f08cc6f Merge pull request #7170 from aspangaro/6.0-fix7169 
Fix #7169 : Unknown column 'ba.accountancy_journal' in member's subcription
 2017-07-18 14:46:42 +02:00
hguibourgdev
4b0638dd40 Update list.php 
FIX copy-paste error (sell versus buy)
 2017-07-18 14:43:03 +02:00
Laurent Destailleur
9ea30c427e Merge pull request #7160 from hguibourgdev/patch-4 
Update card.php
 2017-07-18 14:36:12 +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
cfbd47bd78 Fix field null 2017-07-18 14:09:37 +02:00
Laurent Destailleur
97fe41d603 A info int smtp header 2017-07-18 12:49:19 +02:00
Maxime Kohlhaas
d35dbdea92 Change column size in sql table creation also 2017-07-18 10:16:59 +02:00