Commit Graph

40549 Commits

Author SHA1 Message Date
Laurent Destailleur
03a60236af Fix: sort on supplier ref. 2014-02-19 03:03:26 +01:00
Laurent Destailleur
96e7985266 Fix: Translation of menu entries must not be into admin lang file (We
don't want to load this file for common pages).
2014-02-19 02:27:13 +01:00
Laurent Destailleur
18f90520cf Uniformize fields shown 2014-02-19 02:19:54 +01:00
Laurent Destailleur
2e67bbc382 Maxi debug of barcode feature.
New: Barcode format and mandatory requirement is checked.
New: Start to add new page for barcode init.
2014-02-19 01:51:19 +01:00
Laurent Destailleur
03d056319c Qual: Clean code for adding menu entries into Modules system admin
entry.
New: Add entry for admin page Mass barcode init.
2014-02-18 20:49:22 +01:00
Laurent Destailleur
5780f14a65 Qual: Removed TODO and add test to report bug. 2014-02-17 18:27:45 +01:00
Laurent Destailleur
867c83680b Merge remote-tracking branch 'origin/3.5' into develop 2014-02-17 18:22:49 +01:00
Laurent Destailleur
342ee2e6f6 Qual: Add a TODO to warn to remove this bug. 2014-02-17 18:22:15 +01:00
Laurent Destailleur
1cfcda702e Fix: [ bug #1250 ] "Supplier Ref. product" sidebar search box does not
work.
2014-02-17 17:32:25 +01:00
Laurent Destailleur
c8d6a88f8a Clean xdebug page. 2014-02-17 16:30:22 +01:00
Laurent Destailleur
a0e0d17725 Qual: More PHP unit to test dol_escapejs function.
Qual: More PHP unit to test FormAdmin class.
2014-02-17 15:40:04 +01:00
Laurent Destailleur
860ca15cfc Merge remote-tracking branch 'origin/3.5' into develop
Conflicts:
	htdocs/core/class/extrafields.class.php
2014-02-17 15:27:30 +01:00
Laurent Destailleur
e1efd88155 Merge remote-tracking branch 'origin/3.4' into 3.5 2014-02-17 15:22:02 +01:00
Laurent Destailleur
8839ae38d3 Fix: [ bug #1241 ] error in request in select_paper file
/core/class/html.formadmin.class.php
2014-02-17 15:21:19 +01:00
Laurent Destailleur
fa7e7c75bf Fix: Add a protection if user has no option to edit stock 2014-02-17 11:48:57 +01:00
Laurent Destailleur
f987a43358 Fix: Translation 2014-02-17 11:19:50 +01:00
Laurent Destailleur
de64ce5b2a Fix: user right on Holiday for month report nor working 2014-02-17 00:09:48 +01:00
Laurent Destailleur
abc96b51fa Enable extrafields for customer order, proposal and invoice lines. This
feature was developed for 3.5 but was disabled (hidden) because of
a bug not possible to fix enough quickly for 3.5.0 release.
2014-02-16 23:51:29 +01:00
Laurent Destailleur
935b30470d Fix: Missing nowrap 2014-02-16 20:09:25 +01:00
Laurent Destailleur
908c39098d Merge remote-tracking branch 'origin/3.5' into develop
Conflicts:
	htdocs/comm/action/fiche.php
2014-02-16 19:47:51 +01:00
Laurent Destailleur
85e93872b3 Fix: javascript calculation of unit price from margin rate was broken. 2014-02-16 19:42:43 +01:00
Laurent Destailleur
3aba53a9ae Fix: javascript calculation of unit price from margin rate was broken. 2014-02-16 19:26:41 +01:00
Laurent Destailleur
b081083a1a Fix: Bad management of date.
Fix: Submit button was not visible making not possible to filter on
date.
Fix: Use standard css style instead of hardcoded css.
2014-02-16 17:07:17 +01:00
Laurent Destailleur
fd22c9b69a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-02-15 15:23:47 +01:00
Laurent Destailleur
46d1181aed Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-02-15 15:23:42 +01:00
Laurent Destailleur
295f0fd9e7 Makepack is for version 3.5 2014-02-15 15:23:21 +01:00
Laurent Destailleur
7e3c2d40ba New: Make difference between virtual and physical stock easier to
understand.
2014-02-15 14:14:49 +01:00
Laurent Destailleur
7e2027ec39 Fix: Can not set delay to zero. 2014-02-14 13:05:49 +01:00
Laurent Destailleur
4b8d39af9d Fix: Do not report trigger errors twice.
Fix: Error when creating event was not reported.

Conflicts:
	htdocs/comm/action/fiche.php
2014-02-14 13:05:04 +01:00
Laurent Destailleur
1a3bace4e6 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2014-02-14 12:59:26 +01:00
Laurent Destailleur
4b5748fd12 Fix: Can not set delay to zero. 2014-02-14 12:58:03 +01:00
Laurent Destailleur
3e3c541e4c Fix: Do not report trigger errors twice.
Fix: Error when creating event was not reported.
2014-02-14 12:54:04 +01:00
Laurent Destailleur
57153e4de4 Try a cleaner javascript escape function. 2014-02-13 23:40:39 +01:00
Laurent Destailleur
d6ba18cc20 Merge pull request #1416 from syrus34/patch-2
Add fields company_iban and company_bic
2014-02-13 17:53:08 +01:00
Laurent Destailleur
cd2ddf2545 Merge pull request #1418 from grandoc/develop
display adherent module for external user
2014-02-13 17:48:09 +01:00
philippe
6f129c3800 display adherent module for external user 2014-02-13 16:36:34 +01:00
Laurent Destailleur
ead7df3306 Add backslash 2014-02-13 10:54:03 +01:00
Laurent Destailleur
b499efeccf Merge remote-tracking branch 'origin/3.4' into 3.5
Conflicts:
	htdocs/compta/sociales/index.php
	htdocs/compta/tva/index.php
2014-02-12 22:29:56 +01:00
Laurent Destailleur
7d74d0d3bd CFix: The order field for prospect level was not visible making
dictionnary useless.
2014-02-12 22:28:16 +01:00
Laurent Destailleur
ccab2b7af4 Fix: Must use "null" for value when finished is not defined but not when
finished is "0".
2014-02-12 19:00:06 +01:00
syrus34
79d85d5888 Add fields company_iban and company_bic 2014-02-12 18:58:12 +01:00
Laurent Destailleur
5501809844 Fix: sql compare on int must not contains quotes. 2014-02-12 18:47:16 +01:00
Laurent Destailleur
cd44548867 Merge pull request #1414 from atm-alexis/3.5
In certain case, holiday_users won't be update (1 delete, 1 add for ex)
2014-02-12 18:39:56 +01:00
Laurent Destailleur
191ff05873 Fix: W3C. 2014-02-12 18:36:49 +01:00
Laurent Destailleur
0d03f13777 Add comments 2014-02-12 15:21:06 +01:00
Laurent Destailleur
2e7631fa78 Fix: translation 2014-02-12 15:17:33 +01:00
Laurent Destailleur
b4977cd542 Fix: Bad permission var 2014-02-12 12:52:31 +01:00
Laurent Destailleur
634c5b64f1 Merge remote-tracking branch 'origin/3.5' into develop
Conflicts:
	htdocs/product/fiche.php
2014-02-12 00:25:08 +01:00
Laurent Destailleur
266b413139 Fix: colspan for extrafields 2014-02-12 00:23:15 +01:00
Laurent Destailleur
05c4961a36 Better css 2014-02-12 00:10:49 +01:00