Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-14 08:54:21 +01:00
Code Issues Packages Projects Releases Wiki Activity
41,083 Commits 39 Branches 191 Tags
d452624ebc5035f4c51863bdac718db2b341fb0f
Commit Graph

41083 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
d452624ebc Fix: Building on obs 2014-04-01 09:08:52 +02:00
Laurent Destailleur
d2cb5e8d2d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-03-31 22:56:47 +02:00
Laurent Destailleur
897a9b7446 Sync from transifex. 2014-03-31 19:01:28 +02:00
Laurent Destailleur
56c7d14b9a We do not force disabling of ckeditor for phones. We let ckeditor 
decide (currently ckeditor is disabled with android).
 2014-03-31 13:25:40 +02:00
Laurent Destailleur
c81406c7f3 Fix: CI 2014-03-31 02:41:15 +02:00
Laurent Destailleur
7f23bec7c4 Update changelog 2014-03-31 02:21:45 +02:00
Laurent Destailleur
76259a633c Clean constant FACTURE_TVAOPTION into conf.class.php so we don't have 
to do it everywhere at different places. Value is now 0 or 1.
 2014-03-31 02:16:49 +02:00
Laurent Destailleur
39f48f25db Fix: Trip and expenses were moved into menu hrm 2014-03-31 01:48:50 +02:00
Laurent Destailleur
d48cbeb720 Fix: W3C 2014-03-31 01:45:48 +02:00
Laurent Destailleur
b675b9b610 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/comm/action/fiche.php
	htdocs/core/class/conf.class.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/company.lib.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/fourn/facture/fiche.php
	htdocs/langs/en_US/admin.lang
	htdocs/margin/agentMargins.php
	htdocs/margin/customerMargins.php
	htdocs/margin/productMargins.php
	htdocs/projet/tasks/task.php
 2014-03-31 00:44:45 +02:00
Laurent Destailleur
ed49f88446 Fix: deleting files into backup system tools. 
Fix: Dump using php not not include lock on tables that are deleted.
 2014-03-31 00:19:31 +02:00
Laurent Destailleur
3d8fb60f94 Start to implement sepa format. Need serious tests. 2014-03-30 20:22:54 +02:00
Laurent Destailleur
d3dc68d8a7 Prepare script to publish to foundation storage 2014-03-30 19:33:29 +02:00
Laurent Destailleur
2396382ccb Fix: Syntax error 3.6.0-alpha 2014-03-30 18:25:20 +02:00
Laurent Destailleur
95793a5475 Fix: fields into group by of sql requests for module margins must be 
same than fields into select.
 2014-03-30 16:08:30 +02:00
Laurent Destailleur
c506e59d8c Look: Minor fix to not have calendar picto to glue to input 2014-03-30 15:58:41 +02:00
Laurent Destailleur
81306ff1d0 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-03-29 17:38:29 +01:00
Laurent Destailleur
a5c2b78565 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-03-29 17:38:06 +01:00
Laurent Destailleur
88a4af394c Removed dead or useless code. 2014-03-29 14:12:01 +01:00
Laurent Destailleur
205c0ac62d Fix: invert logic. Show child options when parent option is 
selected instead of selected parent when a child is selected.
 2014-03-29 05:18:24 +01:00
Laurent Destailleur
0ca250c6d9 Minor css fixes. 2014-03-29 05:02:02 +01:00
Laurent Destailleur
61f649e1ae Fix: When select_date is called with '' as preselected date, 
automatic user date was not correctly et (We must set a date into PHP
server timezone area)
Fix: First param of select_date must always be forged with a dolibarr
date function and not time().
New: Add a page for tests.
 2014-03-29 04:26:44 +01:00
Juanjo Menent
a1fb21114b New: Add some hooks for financial reports 2014-03-28 18:31:43 +01:00
Juanjo Menent
638e90eb67 Fix: Margin tabs bad data show 2014-03-28 18:23:28 +01:00
Juanjo Menent
acb752c5f2 Fix: Margin tabs bad data show 2014-03-28 18:22:44 +01:00
Laurent Destailleur
d629c55e11 Merge pull request #1514 from KreizIT/batchfix 
Batch Fix
 2014-03-27 16:08:44 +01:00
Laurent Destailleur
f027482b51 Merge pull request #1513 from KreizIT/fixtablestruct 
Fix installation script link to Task 1074 (missing new field)
 2014-03-27 16:06:51 +01:00
Laurent Destailleur
832ebb1cfe Merge pull request #1512 from atm-alexis/3.5 
fix can't add line with product in supplier order
 2014-03-27 16:05:38 +01:00
Laurent Destailleur
4815825501 Merge pull request #1511 from defrance69/patch-2 
Update box_ficheinter.php
 2014-03-27 16:01:57 +01:00
Laurent Destailleur
1affc38d58 Merge pull request #1509 from defrance69/patch-1 
Update mouvement.php
 2014-03-27 15:59:39 +01:00
Laurent Destailleur
f282ffc549 Merge pull request #1508 from KreizIT/3.5 
FIX :[bug #1309]
 2014-03-27 15:58:13 +01:00
Laurent Destailleur
c2b7e40aa1 Merge pull request #1507 from GPCsolutions/3.5-taskswithtime 
Project: make tasks accept a time
 2014-03-27 15:56:26 +01:00
Laurent Destailleur
807cffbc7e Merge pull request #1505 from open-minds/patch-1 
Fix thousands separator in french (Belgium) language file
 2014-03-27 15:46:30 +01:00
Laurent Destailleur
c6b700d449 Merge pull request #1502 from FHenry/3.5 
Fix restrictedearea bug & delete extrafield on delete invoice
 2014-03-27 15:30:15 +01:00
Laurent Destailleur
4d4512fadd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-03-26 22:14:14 +01:00
Laurent Destailleur
9e771269c4 Qual: clean code 2014-03-26 20:46:17 +01:00
KreizIT
fcb588f424 -Fix error when shipping a batch enabled product without stock 
-Fix typo
 2014-03-26 17:18:02 +01:00
KreizIT
5c837583c3 Fix installation script link to Task 1074 (missing new field) 2014-03-26 16:58:43 +01:00
Laurent Destailleur
62a990d6cc Fix: ajax_combobox function must be included before called. 
New: Feature of module survey are now localized into top menu "Tools".
 2014-03-26 16:02:22 +01:00
Laurent Destailleur
c45f509984 Qual: Uniformizing payments 2014-03-26 15:41:09 +01:00
Alexis Algoud
f97c8feb54 fix can't add line with product in supplier order 2014-03-26 11:28:41 +01:00
BENKE Charles
a3a6b6dff6 Update box_ficheinter.php 
External user show only is own intervention
 2014-03-26 10:57:07 +01:00
Juanjo Menent
9291544e09 Merge pull request #1510 from FHenry/develop 
Update fiche.php
 2014-03-26 10:23:38 +01:00
Florian Henry
f93df7f3da remove debug string 2014-03-26 10:09:29 +01:00
Florian Henry
3d12979b3f remove debug string 2014-03-26 09:53:48 +01:00
Laurent Destailleur
59042a30e1 Fix and uniformize code for payment of salaries. 2014-03-25 21:35:52 +01:00
Laurent Destailleur
4828d1e89a New: Uniformize visible information on payment lists. 2014-03-25 20:24:51 +01:00
Laurent Destailleur
a5e8063cfd Fix: Bad management error 2014-03-25 20:09:30 +01:00
Laurent Destailleur
68b54f5cac New: Add hidden option PRODUCT_DISABLE_CUSTOM_INFO to disable custom 
info management (used for export activity only)
 2014-03-25 19:52:04 +01:00
BENKE Charles
680ce297c5 Update mouvement.php 
sometime $year not filled then made "bug" the search
propose to fill with current year in this case
 2014-03-25 15:41:20 +01:00