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

60479 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
5f4dd26303 Merge pull request #7182 from hregis/develop_trad 
NEW add specific translation for title of documents (Invoice, Order, Proposal)
 2017-07-21 14:59:58 +02:00
Laurent Destailleur
094e55f326 Merge pull request #7179 from camlafit/patch-rib 
Allow RUM on creation
 2017-07-21 14:58:56 +02:00
Laurent Destailleur
d07741ada1 Merge branch 'develop' into patch-rib 2017-07-21 14:58:33 +02:00
Laurent Destailleur
27682d9ef3 Update rib.php 2017-07-21 14:52:54 +02:00
Laurent Destailleur
0d15bf5de1 Fix ducplicate code 2017-07-21 12:55:50 +02:00
Laurent Destailleur
374e46af00 Fix ducplicate code 2017-07-21 12:53:15 +02:00
Laurent Destailleur
168f167934 Tooltip 2017-07-21 12:42:21 +02:00
Laurent Destailleur
058e88c6f3 Fix title in html header 2017-07-21 12:26:11 +02:00
Laurent Destailleur
23d9353a3d Fix title in html header 2017-07-21 12:21:48 +02:00
Laurent Destailleur
a6960187f4 Fix missing css 2017-07-21 12:01:16 +02:00
Laurent Destailleur
827e04f130 Fix missing css 2017-07-21 11:58:55 +02:00
Regis Houssin
48d79357a0 New: add specific translation for title of documents 2017-07-21 10:03:09 +02:00
Laurent Destailleur
302ee97d31 Debug module website 2017-07-21 02:51:56 +02:00
Laurent Destailleur
522f21e528 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/public/websites/index.php
 2017-07-21 02:32:01 +02:00
Laurent Destailleur
28254655e9 Debug module website 2017-07-21 02:30:02 +02:00
Laurent Destailleur
5318e513c1 Debug module website 2017-07-21 02:29:24 +02:00
Laurent Destailleur
1fd3ab56a8 Fix edit of css and htmlheader 2017-07-21 00:01:27 +02:00
Laurent Destailleur
df61a5f045 Debug module website 2017-07-20 20:05:49 +02:00
Laurent Destailleur
dfb49fc47b Fix update tms 2017-07-20 18:36:18 +02:00
Laurent Destailleur
7760594643 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/website.lang
	htdocs/theme/eldy/style.css.php
	htdocs/websites/class/website.class.php
	htdocs/websites/index.php
 2017-07-20 18:31:58 +02:00
Laurent Destailleur
fa3ed50f3a Fix sql syntax 2017-07-20 18:23:42 +02:00
Laurent Destailleur
2f3128410b Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-07-20 16:49:56 +02:00
Laurent Destailleur
3b8f60f90e Fix pb of recursive include in website module 2017-07-20 16:49:20 +02:00
Laurent Destailleur
2621c55bf4 Link of preview is enabled only if setup is correct. 2017-07-20 11:51:30 +02:00
Laurent Destailleur
1e7aa4d9b4 Work on module website 2017-07-19 16:38:00 +02:00
Laurent Destailleur
84f621fde3 Fix migration on pgsql 2017-07-19 16:31:15 +02:00
cam.lafit
f0d95fcbd9 fixup! Allow RUM on creation step 2017-07-19 16:29:56 +02:00
cam.lafit
69aed8ac7f Allow RUM on creation step 
* close #4932
 2017-07-19 16:27:34 +02:00
Laurent Destailleur
74db61ce15 Fix translation 2017-07-19 15:50:57 +02:00
Laurent Destailleur
1bc2bba953 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-07-18 15:15:50 +02:00
Laurent Destailleur
6665416d97 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-07-18 15:15:31 +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
782cde37b3 Merge pull request #7175 from ATM-Marc/NEW_units_import_products 
NEW add fk_unit field into product/service import/export
 2017-07-18 14:49:59 +02:00
Laurent Destailleur
b215940277 Merge pull request #7174 from atm-maxime/fix_user_from_member 
Fix : creating user from member was failing due to column size difference
 2017-07-18 14:49:33 +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
Laurent Destailleur
ba2dcb9221 Merge pull request #7166 from hregis/5.0_bug 
Fix: Trusty become default linux the July 18th 2017
 2017-07-18 14:45:55 +02:00
Laurent Destailleur
c59059ad9d Merge pull request #7167 from hregis/6.0_bug 
Fix: php 5.6 is ok now (travis)
 2017-07-18 14:45:26 +02:00
hguibourgdev
4b0638dd40 Update list.php 
FIX copy-paste error (sell versus buy)
 2017-07-18 14:43:03 +02:00
Laurent Destailleur
636c6ea880 Merge pull request #7163 from hguibourgdev/patch-6 
Update list.php
 2017-07-18 14:42:26 +02:00
Laurent Destailleur
b2c00ac463 Merge pull request #7161 from hguibourgdev/patch-4 
Patch 4
 2017-07-18 14:38:34 +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
c10852bea3 Merge pull request #7158 from articoder-infosec/patch-1 
Reason: similar change is present elsewhere in the code.
 2017-07-18 14:33:41 +02:00