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

43108 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
BENKE Charles
f1d9cebb93 Update propal.class.php 
refactoring LibStatut function (small is better)
 2014-03-31 02:38:07 +02:00
Laurent Destailleur
1fad693867 Fix: Removed useless strtolower 2014-03-31 02:25:35 +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
Marcos García de La Fuente
e6bd3921f1 Fixed a problem with bank accounts sharing across entities 2014-03-30 23:00:35 +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 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
aspangaro
6e0788c8c1 Merge branch 'upstream/develop' 2014-03-30 08:07:07 +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
aspangaro
52cd8792b7 Merge branch 'upstream/develop' 2014-03-29 06:50:34 +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
aspangaro
e0dc01fe85 Merge branch 'upstream/develop' 2014-03-28 12:37:42 +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
ae728645d6 Merge pull request #1504 from marcosgdf/multicompany-fixes 
Fix: Agenda and Banks module were not working with multicompany module
 2014-03-27 15:31:54 +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
Raphaël Doursenaud
771f205d2a Langs: added translation string for action triggers that were missing 2014-03-27 12:04:03 +01:00
Raphaël Doursenaud
5acfb5adc7 Langs: removed duplicate key 2014-03-27 12:04:03 +01:00
Raphaël Doursenaud
800067a478 Added a dev script to help identify duplicate translation keys in language files 2014-03-27 12:04:03 +01:00
Raphaël Doursenaud
09b6ccbe58 Qual: generic shebang 2014-03-27 12:04:03 +01:00
Raphaël Doursenaud
e07e86b824 Deduplicated lines of the reference language files 
Used the new deduplicatefilelinesrecursively.sh script
 2014-03-27 12:04:03 +01:00
Raphaël Doursenaud
c5d8892d89 Added a dev script to recursively deduplicate file lines on a per file basis 
This script is useful to deduplicate language files
 2014-03-27 12:04:03 +01:00
Raphaël Doursenaud
cd7a378eb0 Action triggers/Langs: fixed a bad translation key 2014-03-27 12:04:03 +01:00
Raphaël Doursenaud
0d7a76d8db 3.6 migration script: fixed invalid comments 2014-03-27 12:04:03 +01:00
Raphaël Doursenaud
ee71e42b34 Action triggers: added missing triggers to 3.6 migration script 
These are the same changes than commit 3afb3a874d9d1533947651de9db28c9207278908 but for the
migration script
 2014-03-27 12:03:19 +01:00
Raphaël Doursenaud
8d6084db39 Automatic agenda triggers: uncomment useful syslog 
The syslog was commented but is useful to spot unimplemented handlers that were nonetheless
enabled in the administration interface.
Also made it issue a warning level message.
 2014-03-27 12:02:16 +01:00
Raphaël Doursenaud
c9c75a1c08 Action triggers: Added copyright 
Reindented the whole block because it was out.
 2014-03-27 12:02:15 +01:00
Raphaël Doursenaud
704699f9a1 Action triggers: added missing triggers to the data dictionnary 
These triggers were programmed in
htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
but were nowhere to be found in the interface because they didn't hit the database.
 2014-03-27 12:02:15 +01:00