Commit Graph

43078 Commits

Author SHA1 Message Date
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
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
Cedric
57cf384617 Keep value on validtions failure 2014-03-25 13:05:29 +01:00
Cedric
e16385b496 FIX :[bug #1309] 2014-03-25 11:48:44 +01:00
Raphaël Doursenaud
7d0853d9e5 Removed debug code 2014-03-25 11:36:22 +01:00
Raphaël Doursenaud
d9cb1da4d5 Project: make tasks accept a time 2014-03-24 15:26:36 +01:00
Florian Henry
bb07d7f814 Merge branch '3.5' of https://github.com/Dolibarr/dolibarr.git into 3.5 2014-03-24 13:25:35 +01:00
Laurent Destailleur
f115501ddf Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-03-24 00:16:47 +01:00
Laurent Destailleur
3f78fe8c93 Fix: Avoid to get duplicate field 2014-03-23 21:01:05 +01:00
Laurent Destailleur
6039c81845 Fix: copy to clipboard does not work with jmobile
Fix: Bad translation
2014-03-23 20:56:41 +01:00
Laurent Destailleur
57bd043f59 Fix: Missing lang loading 2014-03-23 20:30:54 +01:00
Laurent Destailleur
466de67b5b Fix: Solve pb of too many embedded tables 2014-03-23 20:18:07 +01:00
aspangaro
bc48ddd3fc Présentation 2014-03-23 16:33:05 +01:00
aspangaro
81c9446d11 Merge branch 'upstream/develop' 2014-03-23 14:53:31 +01:00
Laurent Léonard
1663a7a6fa Fix thousands separator in french (Belgium) language file 2014-03-23 14:46:09 +01:00
Marcos García de La Fuente
09e02f807f Even better improvement 2014-03-22 19:01:19 +01:00