Laurent Destailleur
cf8ff97855
Fix: Install of odt templates for project and tasks failed.
2014-04-02 13:17:20 +02:00
Laurent Destailleur
3a2caa6e64
New: Can filter on status for supplier order.
2014-04-02 12:48:34 +02:00
Laurent Destailleur
7ac193bb80
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/core/lib/company.lib.php
htdocs/opensurvey/public/choix_autre.php
2014-04-02 11:41:55 +02:00
Florian Henry
a2a46f9300
Extrafield select form table do not display selected value on edit mode
2014-04-02 11:34:15 +02:00
Laurent Destailleur
46e46507ec
Merge remote-tracking branch 'origin/3.4' into 3.5
...
Conflicts:
htdocs/comm/action/index.php
htdocs/compta/bank/class/account.class.php
htdocs/compta/bank/index.php
2014-04-02 11:33:47 +02:00
Laurent Destailleur
6dab09e07a
Fix: Bad dialog position
2014-04-02 00:04:13 +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
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
1fad693867
Fix: Removed useless strtolower
2014-03-31 02:25:35 +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
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
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
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
c2b7e40aa1
Merge pull request #1507 from GPCsolutions/3.5-taskswithtime
...
Project: make tasks accept a time
2014-03-27 15:56:26 +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
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
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
BENKE Charles
a3a6b6dff6
Update box_ficheinter.php
...
External user show only is own intervention
2014-03-26 10:57:07 +01:00
Raphaël Doursenaud
d9cb1da4d5
Project: make tasks accept a time
2014-03-24 15:26:36 +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
466de67b5b
Fix: Solve pb of too many embedded tables
2014-03-23 20:18:07 +01:00
Marcos García de La Fuente
09e02f807f
Even better improvement
2014-03-22 19:01:19 +01:00
Marcos García de La Fuente
e2f51d0df2
Removed duplicate line
2014-03-22 19:00:37 +01:00
Marcos García de La Fuente
c8c77dbdcf
Fix: Agenda and Banks module were not working with multicompany module
2014-03-22 18:59:48 +01:00
Laurent Destailleur
a1e778c146
Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5
2014-03-21 21:12:02 +01:00
Laurent Destailleur
1061a650d2
Fix: duplicate info
2014-03-21 21:11:51 +01:00
Laurent Destailleur
4bd6f11112
Backport fix to solve warning problems.
2014-03-21 18:35:50 +01:00
Laurent Destailleur
ed7ffebea4
Code comment
2014-03-21 18:32:18 +01:00
Laurent Destailleur
24dbfbba60
Qual: Still working on cleaning code for timezone management.
2014-03-21 18:05:08 +01:00
Laurent Destailleur
73682baff0
Fix: Use correct vat rate into text cases.
...
Qual: Next step cleaning date functions.
Qual: Complete phpunit test case for dol_mktime to check dayling saving
time is correctly managed.
2014-03-21 16:22:41 +01:00
Laurent Destailleur
b2f6498236
Merge remote-tracking branch 'origin/3.5' into develop
2014-03-21 15:03:37 +01:00
Laurent Destailleur
7fb004903e
Qual: Start to clean old code.
2014-03-21 15:02:27 +01:00
Laurent Destailleur
a884673637
Fix: A better to fix to manage automatic creation of code for import.
2014-03-21 13:29:13 +01:00
Laurent Destailleur
c1411e65b7
Fix: Try to add code to provide easy way to fix warning on timezone not
...
defined.
2014-03-21 10:13:29 +01:00
Laurent Destailleur
aabd923248
Try to remove warning
2014-03-21 09:49:10 +01:00
Laurent Destailleur
4bf822225e
Look: info admin picto now use the info picto (the star were confused
...
with the mandatory "star").
2014-03-19 23:50:10 +01:00
Laurent Destailleur
f9c1b590d0
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
build/debian/changelog
build/doxygen/dolibarr-doxygen.doxyfile
build/exe/doliwamp/doliwamp.iss
build/perl/virtualmin/dolibarr.pl
build/rpm/dolibarr_fedora.spec
build/rpm/dolibarr_generic.spec
build/rpm/dolibarr_mandriva.spec
build/rpm/dolibarr_opensuse.spec
htdocs/compta/facture.php
htdocs/core/modules/import/import_csv.modules.php
htdocs/filefunc.inc.php
2014-03-19 22:29:18 +01:00
Laurent Destailleur
d3e951e1ec
Merge remote-tracking branch 'origin/3.4' into 3.5
2014-03-19 20:22:04 +01:00
Laurent Destailleur
2cced0bf43
Perf: Avoid makign a "desc table" for each row we import (for this we
...
are using a global cache array).
2014-03-19 20:02:39 +01:00
Laurent Destailleur
062c150bc1
Fix: import of fields with value "auto"
2014-03-19 19:33:43 +01:00
Laurent Destailleur
212deb9e1c
Fix: fails to import when value is 'AUTO' because compare was case
...
sensitive.
2014-03-19 17:15:18 +01:00
Laurent Destailleur
2f10198064
Fix: Option MAIN_PDF_DASH_BETWEEN_LINES was not working when tcpdf was
...
making a pagebreak higher than 2 pages.
2014-03-19 16:36:12 +01:00
Laurent Destailleur
bf735cacbe
Fix PDF: Page break was ko when breaking 2 pages or more.
...
Fix PDF: pdf_canelle was missing code to manage pagebreak.
Fix PDF: The width of picture was hardcoded into some templates.
Fix PDF: The atleastonediscount was not used into some templates.
2014-03-19 13:32:54 +01:00
Laurent Destailleur
ce4c78972a
Fix: Image always fit into window when using cropping feature even if
...
file is a very large file.
2014-03-18 23:24:00 +01:00
Laurent Destailleur
80088c87ac
Fix: Some debugs of module categories
2014-03-18 00:20:39 +01:00
Laurent Destailleur
7eea96c07c
Minor fix into standing order.
2014-03-17 20:43:01 +01:00
Juanjo Menent
19a3088055
Fix: Add actions events not implemented
2014-03-17 17:05:55 +01:00
Laurent Destailleur
8cf3d258f4
Fix: Bug into calculation of total of time for tasks
2014-03-17 15:13:24 +01:00
Laurent Destailleur
2889c3ac70
Qual: Feature to make payment of salaries has been moved into a module
...
(module dedicated to manage salaries and salary payments).
Qual: Also module for employee to declare trip and expenses has been
moved into same place than module for employee to declare holidays
(into HRM top entry). It is not an accountancy module so no reason to
have it into entry "Accountancy".
2014-03-17 14:30:55 +01:00
Laurent Destailleur
14d8bfef3a
New: Improved Opensurvey module: Description of survey use wysiwig
...
editor, More information shown on result tab, Renamed "survey" into
"poll" (better translation).
2014-03-17 12:40:12 +01:00
Laurent Destailleur
81b8961dab
Qual: Dead code war
2014-03-17 11:13:53 +01:00
Laurent Destailleur
7974ae96ad
Merge branch 'cat_extrafields' of https://github.com/aternatik/dolibarr
...
into aternatik-cat_extrafields
Conflicts:
htdocs/install/mysql/migration/3.5.0-3.6.0.sql
2014-03-16 21:38:29 +01:00
Laurent Destailleur
b1498c584d
Merge branch 'dluo_step5' of https://github.com/KreizIT/dolibarr into
...
KreizIT-dluo_step5
Conflicts:
htdocs/fourn/class/fournisseur.commande.class.php
2014-03-16 20:49:56 +01:00
Laurent Destailleur
58add21719
Merge pull request #1488 from atm-maxime/mko1300
...
Add task 1300 : Add thm field on user and time spent to be able to calculate employee cost
2014-03-16 20:26:57 +01:00
Laurent Destailleur
599142566e
Merge pull request #1492 from aspangaro/develop
...
Fix :: Failed to apply auguria_menu
2014-03-16 20:25:13 +01:00
aspangaro
5175dcf135
Update also eldy menu
2014-03-16 20:17:25 +01:00
Laurent Destailleur
ed4f7fd083
Fix: error
2014-03-16 20:05:07 +01:00
Laurent Destailleur
2d3c700a7d
Fix: When cloning product, autogenerating barcode must not use same
...
number.
Qual: Moved dedicated permission of module to "advance" permissions.
2014-03-16 17:37:54 +01:00
aspangaro
b09d7065c9
Fix :: Failed to apply auguria_menu since integration of salary payment in tax module
2014-03-16 17:30:58 +01:00
Jean-François Ferry
55750e16d8
Prepare extrafields into categories
2014-03-16 14:48:46 +01:00
Maxime Kohlhaas
4d48034ad1
Fix
2014-03-16 09:50:03 +01:00
Laurent Destailleur
cafa61ef7d
Fix: Use correct syntax of date into sql requests (with quotes)
2014-03-15 23:12:00 +01:00
Laurent Destailleur
104f2873da
Qual: Remove code to fix dynamically bad code.
2014-03-15 22:30:40 +01:00
Maxime Kohlhaas
685c00cd27
Fix : Delivery date was displayed twice
2014-03-15 17:55:57 +01:00
Florian Henry
7625629491
Fix [ bug #1294 ] Expedition model Merou having problems with long names
2014-03-15 16:40:29 +01:00
Florian Henry
18c4d890dd
Fix [ bug #1283 ] ROUGET Shipment PDF
2014-03-15 16:32:46 +01:00
KreizIT
3782742aad
- add batch management on supplier dispatch product
...
- SECURITY FIX : replace $_GET and $_POST by GETPOST in dispatch.php
2014-03-15 10:28:01 +01:00
Raphaël Doursenaud
a23f6d6a85
Database: factorized lastqueryerror()
2014-03-15 08:41:46 +01:00
Raphaël Doursenaud
7df97b7cfb
Database: factorized lasterror()
2014-03-15 08:41:46 +01:00
Raphaël Doursenaud
f894df1d9e
Database: factorized lastquerry()
2014-03-15 08:41:46 +01:00
Raphaël Doursenaud
e4e78bdd3e
Database: factorized getLabel()
2014-03-15 08:41:43 +01:00
Raphaël Doursenaud
3f6b175879
Database: factorized getVersionArray()
2014-03-15 06:40:13 +01:00
Raphaël Doursenaud
73d957f158
Database: factorized common properties
2014-03-15 06:38:52 +01:00
Raphaël Doursenaud
f91e2ec7b2
Database: factorized begin()
2014-03-15 06:17:12 +01:00
Raphaël Doursenaud
739a566156
Database: factorized lasterrno()
2014-03-15 06:07:46 +01:00
Raphaël Doursenaud
0ab6fcaaca
Database: factorized idate()
2014-03-15 06:04:16 +01:00
Raphaël Doursenaud
64fbefdb7c
Database: factorized ifsql()
2014-03-15 05:55:02 +01:00
Raphaël Doursenaud
eb86abff94
Database: factorized jdate()
2014-03-15 05:54:51 +01:00
Florian Henry
3f6b319d41
Fix deposit invoice
2014-03-14 23:42:45 +01:00
Maxime Kohlhaas
3131b92988
Fix bug 1293 : numbering failed
2014-03-14 23:18:46 +01:00
philippe grand
f9c48be2a9
fix : display specimen
2014-03-14 18:23:37 +01:00
Laurent Destailleur
32364ac18b
Move skype module from experimental to stable.
2014-03-14 15:26:26 +01:00
Laurent Destailleur
4154f07dfd
New: Add a public url as a property for products/services.
2014-03-14 13:51:46 +01:00
Laurent Destailleur
561a1a1aac
Fix: Miscellaneous problems on task tabs (withproject parameter lost and
...
download fails).
2014-03-14 02:07:54 +01:00
Laurent Destailleur
f1b05dd3c2
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2014-03-13 12:37:39 +01:00
Laurent Destailleur
6cec011df6
New: Add manager name (ceo, director, president...) into main company
...
information page.
2014-03-13 12:22:53 +01:00
Laurent Destailleur
743b0f1834
Merge pull request #1458 from KreizIT/dluo_step4
...
Dluo step4
2014-03-13 11:57:06 +01:00
Laurent Destailleur
bdb2b7a547
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/projet/index.php
test/phpunit/FunctionsTest.php
2014-03-13 09:20:05 +01:00
Laurent Destailleur
ded5d47afc
Fix: multilangs array was not loaded.
2014-03-12 01:21:18 +01:00
Laurent Destailleur
241ae7a4d1
Fix: Miscellaneous bugs on tasks management
...
Conflicts:
htdocs/core/lib/project.lib.php
2014-03-11 20:53:47 +01:00
Laurent Destailleur
2740886711
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2014-03-11 20:38:57 +01:00
Laurent Destailleur
afca98323b
Fix: Miscellaneous bugs on tasks management
2014-03-11 20:38:29 +01:00
Laurent Destailleur
5ee17a2f14
Merge pull request #1460 from atm-gauthier/3.5
...
error on ajax_constantonoff function
2014-03-11 11:53:44 +01:00
aspangaro
d97f9e50cd
Merge branch 'upstream/develop'
2014-03-11 10:40:22 +01:00
Laurent Destailleur
c9edced656
- New: Add filter on project status into task list. By default, only
...
"opened" project are visible.
- New: Status "validated" for project are renamed into "opened".
2014-03-11 09:43:26 +01:00
Marcos García de La Fuente
20262a0164
Fix bug #1295 : Error when creating an agenda extrafield with a number as reference
2014-03-10 23:58:16 +01:00
Gauthier
92e8f54e9a
error on ajax_constantonoff function
2014-03-10 10:53:20 +01:00
Laurent Destailleur
2a853329e5
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/core/class/doleditor.class.php
htdocs/main.inc.php
htdocs/product/class/product.class.php
2014-03-08 14:25:59 +01:00
Laurent Destailleur
c082d7c82e
Merge remote-tracking branch 'origin/3.4' into 3.5
...
Conflicts:
htdocs/main.inc.php
2014-03-08 14:17:49 +01:00
Laurent Destailleur
2e2f86b968
Merge remote-tracking branch 'origin/3.3' into 3.4
...
Conflicts:
htdocs/core/class/doleditor.class.php
htdocs/main.inc.php
2014-03-08 14:14:23 +01:00
Laurent Destailleur
a6bb785b5f
Fix: Compatibility with v4 of ckeditor (for debian)
2014-03-08 14:06:01 +01:00
Laurent Destailleur
2c0f1340d5
New: Update ckeditor to version 4 (part 2)
2014-03-08 13:17:20 +01:00
aspangaro
db0a45d78f
Merge branch 'upstream/develop'
2014-03-08 04:54:24 +01:00
Laurent Destailleur
0a2a635755
Fix: td balance.
...
Fix: New price was not used when editing a line when margin module was
on.
2014-03-07 11:58:30 +01:00
KreizIT
a0f1a60780
Change on shipment for batch product
2014-03-07 11:35:16 +01:00
Laurent Destailleur
32c81588b0
Fix: doxygen
2014-03-07 10:54:57 +01:00
aspangaro
048b3c01ce
Add salary payment in tax module - Link to user.
...
Necessary for future hrm module.
2014-03-06 21:21:16 +01:00
Laurent Destailleur
15aebfb7a3
Merge pull request #1455 from marcosgdf/bug-loadban
...
Corrected bug when creating document from ODT template
2014-03-06 18:38:56 +01:00
Laurent Destailleur
260dfe3844
Merge pull request #1454 from marcosgdf/locale-line-odt-tags
...
Locale line ODT tags
2014-03-06 18:34:33 +01:00
Laurent Destailleur
cd3e56a2d0
Merge pull request #1450 from grandoc/develop
...
fix english misspelling
2014-03-06 18:23:51 +01:00
Marcos García de La Fuente
ca0eb7919e
Corrected call to non-existing function
2014-03-06 09:02:36 +01:00
Marcos García de La Fuente
4433f6e8b7
Missing copyright info
2014-03-06 09:01:44 +01:00
Marcos García de La Fuente
c7566893a3
Corrected array indentation
2014-03-06 08:56:28 +01:00
Marcos García de La Fuente
2c22c7707f
Created locale ODT line tags for invoice, shipment and order modules, and corrected the use of line_price_ht, line_price_ttc and line_price_vat tags
2014-03-06 08:55:37 +01:00
Laurent Destailleur
fa098adc78
Fix: infinite loop in function num_public_holiday
2014-03-05 21:29:33 +01:00
Laurent Destailleur
774017672f
Fix: Number of day calculation. Add PHPUnit case.
2014-03-05 20:52:27 +01:00
Laurent Destailleur
6f60755426
New: Add option MAIN_FAVICON_URL
2014-03-05 17:26:59 +01:00
Laurent Destailleur
16a074a69b
Use better module id number
2014-03-05 12:25:31 +01:00
Grand Philippe
e32d31f76d
fix english misspelling
2014-03-05 09:58:52 +01:00
philippe
e2b29bb108
fix english misspelling
2014-03-05 09:57:36 +01:00
Laurent Destailleur
cdd2815d45
Merge pull request #1449 from KreizIT/dluo_step2
...
Dluo step2
2014-03-05 00:08:58 +01:00
Laurent Destailleur
c5e639041e
More doc comment
2014-03-04 23:56:35 +01:00
KreizIT
7f275dfbf4
- Add table modification for product (forget in step 1)
...
- Add module for batch number management
- change dependency for stock and product
- change product class and fiche showing new select for batch managment on product
2014-03-04 18:55:55 +01:00
Laurent Destailleur
24b0ea6613
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
build/makepack-dolibarr.pl
htdocs/comm/propal.php
htdocs/compta/facture.php
htdocs/fourn/class/fournisseur.commande.class.php
2014-03-03 19:38:02 +01:00
Laurent Destailleur
df829177bc
Fix: Submit form of graph box was reseting params of others.
2014-03-02 17:45:40 +01:00
Laurent Destailleur
fd9d0747c8
Fix: Bad description
2014-03-02 16:44:31 +01:00
Laurent Destailleur
998ecc3c15
Optimize code.
2014-03-01 15:59:09 +01:00
Laurent Destailleur
206181a542
Merge pull request #1441 from syrus34/patch-3
...
Update commondocgenerator.class.php
2014-03-01 13:40:14 +01:00
Laurent Destailleur
b64a2b2718
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/comm/action/fiche.php
2014-02-28 21:43:29 +01:00
Laurent Destailleur
68a508a0d1
Fix: sql error on numbering module for tasks
2014-02-28 21:40:08 +01:00
syrus34
dbdb8de79d
Update commondocgenerator.class.php
...
With version 3.5, a company can have several bank account
2014-02-28 07:06:38 +01:00
BENKE Charles
303c459777
Update modProjet.class.php
...
bad incrementation
2014-02-27 11:29:08 +01:00
Laurent Destailleur
193a551b0a
Merge pull request #1421 from defrance69/patch-30
...
Update modProjet.class.php
2014-02-27 11:19:28 +01:00
Laurent Destailleur
8f0e96fd02
Merge pull request #1440 from grandoc/develop
...
anglicized
2014-02-27 11:17:30 +01:00
Laurent Destailleur
827f7e898a
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2014-02-27 10:50:27 +01:00
Laurent Destailleur
06b1c8b64a
Merge branch '3.5' of https://github.com/Dolibarr/dolibarr.git into 3.5
...
Conflicts:
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
2014-02-27 10:47:15 +01:00
Laurent Destailleur
f7fe25e408
Uniformize code to prepare mass update
2014-02-27 10:37:23 +01:00
philippe
5c4ceb1a53
anglicized
2014-02-27 10:06:11 +01:00
philippe
1223e6a08b
anglicized
2014-02-27 09:54:31 +01:00
Laurent Destailleur
4be679a7b2
Second try for Fix: The delivery date was missing.
2014-02-26 17:25:32 +01:00
Laurent Destailleur
0c2ca119d7
Fix: Add a test to avoid the non stable and experimental fuc...
...
feature "MAIN_MENU_USE_JQUERY_LAYOUT" to make application hang.
2014-02-26 16:51:38 +01:00
Laurent Destailleur
480b09f192
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
ChangeLog
htdocs/comm/propal.php
htdocs/commande/fiche.php
htdocs/societe/class/societe.class.php
2014-02-26 15:49:29 +01:00
Laurent Destailleur
9505f9e47c
Fix: The delivery date was missing.
2014-02-26 15:41:56 +01:00
Laurent Destailleur
855dac45ea
Fix: select_comptes was always making a filter on field clos making
...
other filter field not working in some case.
2014-02-26 15:29:40 +01:00
Laurent Destailleur
a822bc0736
Fix: The delivery date was missing.
2014-02-25 19:22:00 +01:00
Laurent Destailleur
abff284ab1
Fix: The delivery date was missing.
2014-02-25 19:07:42 +01:00
Laurent Destailleur
1790f905c9
Removed some code specific to databases and use instead correct abstract
...
method of drivers.
2014-02-25 18:25:17 +01:00
Laurent Destailleur
3f05651b94
Merge branch '3.5' of https://github.com/Dolibarr/dolibarr.git into 3.5
2014-02-25 16:14:51 +01:00
Laurent Destailleur
63a2aa3365
Fix: sql error with postgres when creating extrafield with an upper cas
...
character. code for new fields must be always lowercase.
2014-02-25 15:48:13 +01:00
Laurent Destailleur
7241714551
Merge pull request #1435 from marcosgdf/export-translations
...
Corrected export translations
2014-02-25 14:11:40 +01:00
Marcos García de La Fuente
e963f55593
Corrected CS error
2014-02-25 13:34:33 +01:00
Marcos García de La Fuente
f7eb4c5b14
Updated user export labels
2014-02-25 04:39:41 +01:00
Marcos García de La Fuente
4fe8e00601
Removed deprecated code
2014-02-25 04:29:34 +01:00
Marcos García de La Fuente
d69939b7b1
Function dol_clone is now a deprecated function
2014-02-25 04:29:09 +01:00
Marcos García de La Fuente
4411908b23
Fixed translations of project export wizard
2014-02-25 04:18:13 +01:00
Laurent Destailleur
f537f62aea
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/compta/facture/impayees.php
2014-02-24 17:09:21 +01:00
Laurent Destailleur
22854e5743
New: Sending remind of unpayed invoices by emails (need tester)
2014-02-24 16:50:36 +01:00
Laurent Destailleur
28739414f2
Merge pull request #1430 from FHenry/develop
...
Price management enhancement (multiprice level, price by … customer, if MAIN_FEATURES_LEVEL=2 Price by qty)
2014-02-24 10:14:48 +01:00
Laurent Destailleur
a797a5e665
Clean comment and make some implementations
2014-02-24 09:52:48 +01:00
Laurent Destailleur
404d24a029
Merge pull request #1426 from GPCsolutions/dbinterface
...
Common Database interface
2014-02-24 09:24:35 +01:00
Florian Henry
46ae5d6e9c
- New: Price management enhancement (multiprice level, price by
...
customer, if MAIN_FEATURES_LEVEL=2 Price by qty)
- Fix: Project Task numbering rule customs rule works
2014-02-23 16:16:47 +01:00
Raphaël Doursenaud
0a74467296
Added FIXMEs and TODOs on all dummy methods in database drivers
2014-02-21 14:57:19 +01:00
Raphaël Doursenaud
501ffb12b3
Added dummy methods according to interface for Microsoft SQL and PostgreSQL
...
Please implement if you have the required knowledge
2014-02-21 14:52:21 +01:00
Raphaël Doursenaud
283fec164e
Implemented rollback according to interface for Microsoft SQL and PostgreSQL
2014-02-21 14:40:10 +01:00
Raphaël Doursenaud
894ac6fdc0
Added missing method to mysqli class
2014-02-21 14:27:29 +01:00
Raphaël Doursenaud
ea14ca10cd
Extracted mysql interface
2014-02-21 14:23:32 +01:00
simnandez
92a8fde88b
New: Automatic events for sending mails showing info about mail linked
...
objects.
2014-02-21 12:53:06 +01:00
Laurent Destailleur
e5136487bd
Fix: The customer code was set to uppercase when using numbering module
...
leopard. We must keep data safe of any change.
2014-02-20 16:51:37 +01:00
Laurent Destailleur
9da84e4dd8
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2014-02-20 00:37:20 +01:00
Laurent Destailleur
6f962397e4
Start to work on a mass send remind feature.
2014-02-19 20:23:02 +01:00
simnandez
c2db656c86
Fix: Action event SHIPPING_VALIDATE is not implemented
2014-02-19 17:33:22 +01:00
simnandez
7511f626b3
Fix: Action event SHIPPING_VALIDATE is not implemented
2014-02-19 17:32:20 +01:00
Laurent Destailleur
5a29b3d546
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/societe/soc.php
2014-02-19 15:37:48 +01:00
Laurent Destailleur
4915ec8916
Fix: Bad space in predefined messages.
...
Fix: Signature was not added for email sent from thirdparty page.
2014-02-19 15:33:04 +01:00
Laurent Destailleur
8c9d2418d2
Qual: Move common javascript function into lib_head.js
2014-02-19 11:08:43 +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
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
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
BENKE Charles
8ac8af0f40
Update modProjet.class.php
...
bad incrementation
2014-02-17 12:12:18 +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
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
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
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
syrus34
79d85d5888
Add fields company_iban and company_bic
2014-02-12 18:58:12 +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
46e9b5d550
Merge branch 'develop' of https://github.com/grandoc/dolibarr into
...
grandoc-develop
Conflicts:
htdocs/langs/ar_SA/admin.lang
htdocs/langs/el_GR/admin.lang
htdocs/langs/es_ES/admin.lang
htdocs/langs/nl_NL/admin.lang
htdocs/langs/tr_TR/admin.lang
2014-02-10 01:30:48 +01:00
Laurent Destailleur
ce8d13ead0
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
ChangeLog
build/debian/changelog
build/doxygen/dolibarr-doxygen.doxyfile
build/exe/doliwamp/doliwamp.iss
build/makepack-dolibarr.pl
build/perl/virtualmin/dolibarr.pl
build/rpm/dolibarr_fedora.spec
build/rpm/dolibarr_generic.spec
build/rpm/dolibarr_mandriva.spec
build/rpm/dolibarr_opensuse.spec
htdocs/comm/action/fiche.php
htdocs/filefunc.inc.php
htdocs/install/check.php
2014-02-10 00:38:10 +01:00
Laurent Destailleur
bd25a98e03
New: Generation auto of barcode is available for product.
2014-02-10 00:24:20 +01:00
Laurent Destailleur
94be4ec897
Fix: Avoid error in migration from 3.1 version.
...
Fix: Suggested migration choice was ko from x.y.z to x.y.z+1
2014-02-08 14:55:27 +01:00
Laurent Destailleur
b94f7a6a6d
Fix some amount were missing local version.
2014-02-08 03:51:30 +01:00
Laurent Destailleur
aad7885bca
Fix: [bug #1226 ] page ne se charge pas quand beaucoup de prospect en
...
base
2014-02-08 02:35:59 +01:00
Laurent Destailleur
b750e98d40
Fix: Pb of file upload and download.
2014-02-08 02:02:01 +01:00
Laurent Destailleur
b714347b6b
Fix: Substition of extra field was ko for order.
2014-02-08 01:01:31 +01:00
Laurent Destailleur
43970b3bd6
Removed some TODO
2014-02-06 20:45:50 +01:00
Laurent Destailleur
80046a5310
Qual: Mutualize code
2014-02-06 20:40:01 +01:00
Laurent Destailleur
9e06f185c5
Fix: Fix problem of invalid paypal link with \n.
2014-02-06 18:19:49 +01:00
Laurent Destailleur
c9b1c562cc
Merge branch '3.5' of https://github.com/Dolibarr/dolibarr.git into 3.5
2014-02-06 16:58:53 +01:00
Laurent Destailleur
7078970ed1
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
2014-02-05 21:03:05 +01:00
Laurent Destailleur
255a1f6497
Fix: String translated twice
2014-02-05 20:57:43 +01:00
Grand Philippe
1855ba556a
fix misspelled words
2014-02-05 17:53:30 +01:00
Laurent Destailleur
e3ac9db9ec
Fix: Data was encode twice making bad translation for language with
...
special chars.
2014-02-05 12:11:39 +01:00
Laurent Destailleur
9a985821d2
Fix: doxygen
2014-02-04 21:08:25 +01:00
Laurent Destailleur
d8b8f8c646
Uniformize code for contacts forms.
2014-02-04 20:49:07 +01:00
Laurent Destailleur
0da1a64335
Fix: Missing vars and bar id.
2014-02-04 20:41:23 +01:00
Laurent Destailleur
408a028320
Fix: Must return a string
2014-02-03 20:07:25 +01:00
Laurent Destailleur
8f3e9b1832
Fix: function must return a string
2014-02-03 20:05:56 +01:00
Laurent Destailleur
89ebb3c0ef
New: Add option MAIN_DISABLE_AJAX_COMBOX
2014-02-03 19:47:35 +01:00
Laurent Destailleur
efcff80a28
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
build/debian/control
htdocs/fourn/facture/paiement.php
2014-02-03 18:44:48 +01:00
BENKE Charles
b86322c14a
Update commonobject.class.php
...
hook module need extrafields parameter too
2014-02-01 12:55:05 +01:00
Laurent Destailleur
9aaafde6d5
Fix: Pb with cache files for graphical boxes:
...
Missing year into cache id.
User with restrcited permission on thirdparty must not share same cache
files that "see all" users.
2014-01-31 18:48:57 +01:00
Laurent Destailleur
ba931e18d4
Work on barcode number generation.
...
Normalize code for barcode module.
2014-01-31 18:12:54 +01:00
Laurent Destailleur
40a53d4b57
Fix: used bad constant name
2014-01-31 16:06:28 +01:00
Laurent Destailleur
7f15aa4582
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2014-01-31 11:41:17 +01:00
Laurent Destailleur
1b88ab2355
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/contact/class/contact.class.php
2014-01-31 10:12:41 +01:00
Laurent Destailleur
a2afea7ba9
Work on barcode number generation.
...
Normalize code for barcode module.
2014-01-30 18:21:04 +01:00
Laurent Destailleur
85436f871c
Sec: Missing permission tests
2014-01-30 11:48:14 +01:00
Laurent Destailleur
0e9477167d
Fix: Bad output of extrafields when list is used.
2014-01-30 11:47:25 +01:00
Laurent Destailleur
8abde9e11f
Sec: Missing permission tests
2014-01-30 11:44:31 +01:00
Laurent Destailleur
5076e8ce4e
Fix: Bad output of extrafields when list is used.
2014-01-30 10:48:10 +01:00
Laurent Destailleur
bd3a64d580
Add test ($conf->global->FEATURES_LEVEL >= 2) for extrafields on
...
detailed lines because this feature is currently bugged.
Should work when the 2 forms (predefined product and free product) will
be merged into one (planned for 3.6)
2014-01-30 01:35:01 +01:00
BENKE Charles
a10ccb4d92
Update objectline_add.tpl.php
...
Adding extra fields on line of element
2014-01-29 16:45:37 +01:00
Florian Henry
779aaa51ab
reset function2.lib.php to orign
2014-01-29 10:13:00 +01:00
Florian Henry
526c383f10
Add complete head into agenda
2014-01-29 10:11:39 +01:00
Florian Henry
ca556485e0
Merge branch '3.5' of https://github.com/Dolibarr/dolibarr.git into 3.5
2014-01-29 10:09:44 +01:00
Laurent Destailleur
ee41273286
Fix: Count of files were wrong
2014-01-26 19:27:42 +01:00
Laurent Destailleur
cd277aaf12
Fix: Missing translation
2014-01-26 19:10:05 +01:00
Laurent Destailleur
557fb0a9b1
Fix: miscellaneous css problems
...
Fix: Version was missing into home page when login was already done.
2014-01-26 18:30:45 +01:00
Laurent Destailleur
f50ad96beb
Fix: var init at wrong place
2014-01-25 23:14:57 +01:00
Laurent Destailleur
1a35fb801a
Fix: var init at wrong place
2014-01-25 23:14:25 +01:00
Laurent Destailleur
0a367f03a0
Merge remote-tracking branch 'origin/3.5' into develop
2014-01-25 16:29:19 +01:00
Laurent Destailleur
7149fd76c7
Merge remote-tracking branch 'origin/3.4' into 3.5
...
Conflicts:
htdocs/core/lib/functions2.lib.php
2014-01-25 16:28:21 +01:00
Laurent Destailleur
8d916215cc
New: Add new hook function addMoreActionsButtons to allow a module to
...
add/replace action buttons into an element.
2014-01-24 12:51:01 +01:00
Laurent Destailleur
101151630d
Fix: doxygen errors
2014-01-24 10:38:45 +01:00
Laurent Destailleur
bdbbb580f8
Merge pull request #1381 from altairis-fr/clonepropal
...
clone of propal improvements
2014-01-24 01:33:15 -08:00
Laurent Destailleur
bb1575e0e6
Merge remote-tracking branch 'origin/3.5' into develop
2014-01-24 10:20:03 +01:00
simnandez
a059b66b7d
Fix: box of bank balances lines without decimals
2014-01-23 16:27:34 +01:00
simnandez
6fed307d70
Fix: box of bank balances lines without decimals
2014-01-23 16:26:07 +01:00
Florian Henry
a7c892e23b
Fix Mask numbering
2014-01-21 14:18:00 +01:00
Laurent Destailleur
b8aee5f462
Merge pull request #1388 from FHenry/3.4
...
Correction Reset Mask (before do not work with FA{yy}{mm}-{0000@99} with date 2014-01-01)
2014-01-21 04:59:43 -08:00
Florian Henry
cd84a5fd17
remove debug
2014-01-21 13:48:47 +01:00
Florian Henry
79c2e31439
Fix mask
2014-01-21 13:47:48 +01:00
Laurent Destailleur
3852fe4a1c
Merge pull request #1380 from atm-alexis/3.5
...
Add right to export project in export tool
2014-01-21 04:30:35 -08:00
Laurent Destailleur
0a372a1c7d
Merge remote-tracking branch 'origin/3.5' into develop
2014-01-21 13:26:05 +01:00
Laurent Destailleur
9519c89110
Merge remote-tracking branch 'origin/3.4' into 3.5
2014-01-21 13:23:27 +01:00
Léo
46926aa685
Fix: modBarcode issue with blank list in conf (?)
...
Custom DB prefix not working with barcode module ? Might help.
2014-01-21 13:19:32 +01:00
Laurent Destailleur
709edca05c
Merge pull request #1386 from zongap/patch-1
...
Fix: modBarcode issue with blank list in conf (?)
2014-01-21 04:11:32 -08:00
Florian Henry
163fcc8179
Merge branch '3.5' of https://github.com/Dolibarr/dolibarr.git into 3.5
2014-01-21 12:58:47 +01:00
Florian Henry
398e286be9
Fix reset Mask (befor do not work with FA{yy}{mm}-{0000@99} and date
...
2014-01-01)
2014-01-21 12:58:25 +01:00
Florian Henry
57f8f30494
Correction Reset Mask (before do not work with FA{yy}{mm}-{0000@99} with
...
date 2014-01-01)
2014-01-21 12:57:32 +01:00
Maxime Kohlhaas
60e616f63e
Fix : big bug while importing thirds, codes were not properly set or not imported
2014-01-21 10:29:35 +01:00
Léo
6c00fc33f2
Fix: modBarcode issue with blank list in conf (?)
...
Custom DB prefix not working with barcode module ? Might help.
2014-01-21 00:54:26 +01:00
Laurent Destailleur
e85cf332b3
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2014-01-20 17:34:40 +01:00
Laurent Destailleur
062230050f
New: Can call back barcode number from a product ref or thirdparty ref.
2014-01-20 17:18:56 +01:00
Laurent Destailleur
70debe9d9f
Merge branch '3.5' of https://github.com/Dolibarr/dolibarr.git into 3.5
2014-01-20 11:25:58 +01:00
Laurent Destailleur
5b6b8f1d5b
Fix: Support for reset everymonth (@99 into numbering mask) was ko when
...
changing year.
2014-01-20 11:20:38 +01:00
Laurent Destailleur
8d8e016115
Merge remote-tracking branch 'origin/3.5' into develop
2014-01-20 02:42:37 +01:00
Laurent Destailleur
0d18892506
Merge from 3.4
2014-01-20 02:21:30 +01:00
Laurent Destailleur
1ebd56c4ee
New: Add option MAIN_ADD_SALE_REP_SIGNATURE_IN_NOTE
2014-01-20 00:40:01 +01:00
Laurent Destailleur
699a079ed7
New: Add option MAIN_AUTO_TIMESTAMP_IN_PUBLIC_NOTES and
...
MAIN_AUTO_TIMESTAMP_IN_PRIVATE_NOTES to automatically add
timestamp and user line into editionf field when editing a note.
2014-01-20 00:31:32 +01:00
Laurent Destailleur
73be349233
Merge remote-tracking branch 'origin/3.5' into develop
2014-01-19 23:47:58 +01:00
Laurent Destailleur
5f58bff981
Use _ instead of - for option SUPPLIER_REF_IN_NAME
2014-01-19 22:59:37 +01:00
Laurent Destailleur
6253385b17
Fix: Thumbs was not visible when file was uploaded with extension in
...
upper case.
2014-01-19 22:51:24 +01:00
Laurent Destailleur
123cd787f5
Merge remote-tracking branch 'origin/3.5' into develop
2014-01-19 22:44:34 +01:00
Laurent Destailleur
79e4c283db
Fix: Deletion of files was broken
2014-01-19 22:43:36 +01:00
Laurent Destailleur
cbf6e8563d
New: Add option SUPPLIER_REF_IN_NAME
2014-01-19 22:00:02 +01:00
Laurent Destailleur
becd65f9d3
Fix: Bad space into log
2014-01-19 21:34:48 +01:00
Laurent Destailleur
c7a73e4e00
Merge remote-tracking branch 'origin/3.5' into develop
2014-01-18 12:57:13 +01:00
Laurent Destailleur
22767bac36
Fix: Missing the version into url
2014-01-18 12:51:27 +01:00
Laurent Destailleur
1fd67807ce
Merge remote-tracking branch 'origin/3.5' into develop
2014-01-18 01:13:29 +01:00
Laurent Destailleur
031fd2f8b8
Fix: No set focus
2014-01-17 03:25:31 +01:00
Christophe Battarel
687fc1798b
on clone of propal, copy contact informations
2014-01-16 11:43:59 +01:00
Christophe Battarel
0bdcd108f5
Add supplier informations in product export (supplier name, supplier product ref and supplier unit price)
2014-01-16 11:04:56 +01:00
Laurent Destailleur
c5bcc92651
Rename tag note to differentiate public and private note
2014-01-16 00:07:45 +01:00
Laurent Destailleur
aa69927089
Move table title nowrap tag at a better place.
2014-01-15 18:35:15 +01:00
Laurent Destailleur
ad5fc43e5b
doxygen
2014-01-15 18:20:24 +01:00
Laurent Destailleur
b5620d5f15
New: The box "balance of bank accounts" show all opened accounts.
2014-01-15 17:52:16 +01:00
Alexis Algoud
9a5b46330a
Add right to export project in export tool
...
As the right does not exist, the tool could never be exploited
2014-01-15 14:49:22 +01:00
Laurent Destailleur
c704182b4d
Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4
2014-01-14 18:01:39 +01:00
Laurent Destailleur
bd1a10c116
Fix: doxygen
2014-01-14 16:49:06 +01:00
Grand Philippe
462f65614d
Fix: path to image must not be hardcoded but use dol_buildpath or img_picto with param src=1
2014-01-13 10:10:17 +01:00
Laurent Destailleur
795dcad59f
Fix: The login page should have same code than standard page using
...
common footer.
2014-01-12 22:26:48 +01:00
Laurent Destailleur
4d298b1891
Update code comments and add log warning to help debug
2014-01-12 20:03:18 +01:00
Laurent Destailleur
0990ef3961
Update code comments and add log warning to help debug
2014-01-12 20:02:41 +01:00
BENKE Charles
28204d66b1
Update modFacture.class.php
...
remplace price by subprice on export invoice
2014-01-12 14:59:23 +01:00
Laurent Destailleur
77688100bd
Merge pull request #1372 from defrance69/patch-23
...
Update modFacture.class.php
2014-01-12 05:58:04 -08:00
Laurent Destailleur
06aa3b8250
Merge branch 'opensurvey-improvements' of
...
https://github.com/marcosgdf/dolibarr into
marcosgdf-opensurvey-improvements
Conflicts:
ChangeLog
2014-01-12 14:50:00 +01:00
Laurent Destailleur
02989b9f32
New: An external module can add tabs with a label that is a dynamic
...
value.
Qual: The deprecated way (with 4 parameters) to declare a new tab into a
module descriptor file has been removed. You must now use the 6
parameters way. See file modMyModule.class.php for example.
2014-01-12 14:11:03 +01:00
Raphaël Doursenaud
78b40eaa8c
Handle default session path nicely
2014-01-11 17:30:29 +01:00
Laurent Destailleur
23eb0f3770
Qual: Mutualize code for actions of editing notes
...
New: Add button 'cancel' to cancel edition of a note (private or public)
2014-01-11 13:33:30 +01:00
Laurent Destailleur
171e74ae7e
Reduce time to hide/show
2014-01-11 13:31:12 +01:00
BENKE Charles
dd3da37ce6
Update modFacture.class.php
...
remplace price by subprice on export invoice
2014-01-10 10:35:42 +01:00
Laurent Destailleur
5bdd7fc074
Fix: Doxygen
2014-01-10 03:39:43 +01:00
Laurent Destailleur
9b9492a5d6
New: Start to work on option MAIN_AUTO_TIMESTAMP_IN_NOTES to
...
automatically add timestamp and user line into comment. Remain to do:
Add button "cancel" into note edition mode.
2014-01-10 01:31:23 +01:00
Laurent Destailleur
c3da8ca80a
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2014-01-10 01:25:55 +01:00
Laurent Destailleur
7809e0baa9
Fix: dol_htmlentitiesbr behaviour was different if input was html
...
or not. Add phpunit test to avoid that in future.
2014-01-10 01:25:28 +01:00
Laurent Destailleur
7b63ce1f31
Doxygen
2014-01-10 00:57:17 +01:00
Laurent Destailleur
0b071ac4f1
Merge pull request #1369 from jfefe/fix_extrafield_list
...
Fix : when using several field for label into sellist extrafields
2014-01-09 06:41:27 -08:00
jfefe
77a1d6a43a
Bad value display when using several label into sellist extrafield
2014-01-09 02:40:34 +01:00
jfefe
f554464690
New : ajax list for extrafields list and sellist
2014-01-09 02:10:03 +01:00
jfefe
f1d1522478
Fix : when using several field for label into sellist extrafields traduction is not needed.
...
Without this, the list display "not defined". The key can't exists because label displayed is build from several field so we show raw data
2014-01-09 01:49:59 +01:00
Laurent Destailleur
c0c555b78f
Fix: A lot of fix into sticker sheet dimension management.
...
Fix: Size of font too large to print sticker pages.
Conflicts:
htdocs/core/modules/member/doc/pdf_standard.class.php
htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
2014-01-08 15:16:56 +01:00
Laurent Destailleur
622fe72abf
Fix: A lot of fix into sticker sheet dimension management.
...
Fix: Size of font too large to print sticker pages.
2014-01-08 15:13:41 +01:00
Laurent Destailleur
6ff337ccad
New: Add option 'aZ' into GETPOST function to check parameters
...
contains only a to z or A to Z characters.
2014-01-08 00:10:39 +01:00
Laurent Destailleur
77cfdfd59e
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2014-01-08 00:05:59 +01:00
Laurent Destailleur
0e3757aa5c
New: Add option 'az' into GETPOST
2014-01-08 00:05:14 +01:00
Laurent Destailleur
c7ef0b7c57
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/core/lib/company.lib.php
htdocs/societe/consumption.php
2014-01-07 16:41:00 +01:00
Laurent Destailleur
4d379e572a
Fix: Bugs into permissions for module category
2014-01-07 15:35:26 +01:00
Laurent Destailleur
89c772459f
Fix: Bugs into permissions for module category
2014-01-07 14:55:03 +01:00
Laurent Destailleur
e99883f1a6
Merge remote-tracking branch 'origin/3.4' into 3.5
...
Conflicts:
htdocs/admin/modules.php
2014-01-06 19:18:06 +01:00
Laurent Destailleur
5b63b56143
Merge remote-tracking branch 'origin/3.3' into 3.4
...
Conflicts:
ChangeLog
2014-01-06 19:13:40 +01:00
Laurent Destailleur
ab7a17fe73
Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5
2014-01-06 19:12:06 +01:00
Laurent Destailleur
0e3184c436
Fix: W3C.
...
Fix: Permission on a button.
Conflicts:
htdocs/core/lib/company.lib.php
htdocs/societe/soc.php
Fix: Some menu entry not visible.
2014-01-06 17:17:57 +01:00
Laurent Destailleur
555170e573
Fix: W3C.
...
Fix: Permission on a button.
Fix: Some menu entry not visible.
2014-01-06 17:14:13 +01:00
Laurent Destailleur
7fd34e5ff6
Fix: [ bug #1208 ] Users without read permission on the tasks can still
...
see all project tasks
Fix: function clean_orhpelins was reporting wrong number of cleaned
orphelins.
2014-01-06 13:34:26 +01:00
Laurent Destailleur
7afdad60a0
Fix: [ bug #1208 ] Users without read permission on the tasks can still
...
see all project tasks
2014-01-06 12:42:50 +01:00
Marcos García de La Fuente
2393e7c732
Moved creation poll wizard out of public folder
2014-01-05 19:03:33 +01:00
Laurent Destailleur
2d8214a940
Fix: The delete button into ecm module does not work when ajax disabled.
2014-01-05 18:37:26 +01:00
Laurent Destailleur
5b40eff0fa
Fix: W3C. Input fields can be between a table and tr tag.
2014-01-05 18:30:35 +01:00
Laurent Destailleur
667908baf8
Fix: Missing lang loading
2014-01-05 16:37:33 +01:00
Laurent Destailleur
9a6f22a86e
Fix: W3C no form into table.
...
Fix: Css style overflowwithjm has been superseded by
maxwidthonsmartphone
Fix: Style button disabled was not visible with jmobile
Fix: Rounding corner with jmobile
2014-01-05 15:46:39 +01:00
Marcos García de La Fuente
8d96675607
Force logged user to create surveys and applied Dolibarr style to poll creation wizard
2014-01-05 09:08:42 +01:00
Marcos García de La Fuente
6397b0b7aa
Improving the use of permissions in opensurvey module
2014-01-05 06:18:26 +01:00
Laurent Destailleur
5a7fe6b4a7
Fix: Change to make debian package ok despite removal of ckeditor
...
package.
2014-01-05 01:17:38 +01:00
Laurent Destailleur
d2d0d715a9
Merge remote-tracking branch 'origin/3.4' into 3.5
...
Conflicts:
htdocs/install/mysql/data/llx_c_tva.sql
2014-01-04 19:02:56 +01:00
Laurent Destailleur
2ee5076970
Problem of key of language into auguria menu
2014-01-04 18:57:57 +01:00
Laurent Destailleur
77e2d49658
Merge pull request #1358 from marcosgdf/payment_menu
...
Fixed quality control checks for PR #1357
2014-01-04 09:45:12 -08:00
Laurent Destailleur
ee1e7471ff
Fix: A lot of bug into generation of sticker pages or address pages
...
form members module:
- Position of element was wrong for non A4 pages.
- Removed bugged definition of 5164 sticker template.
- Solve problem of image proportions.
- Margin of right was wrong.
Conflicts:
htdocs/core/modules/member/doc/pdf_standard.class.php
htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
2014-01-04 16:17:47 +01:00
Laurent Destailleur
918c5ff405
Fix: A lot of bug into generation of sticker pages or address pages
...
form members module:
- Position of element was wrong for non A4 pages.
- Removed bugged definition of 5164 sticker template.
- Solve problem of image proportions.
- Margin of right was wrong.
2014-01-04 16:13:34 +01:00
Laurent Destailleur
f6cda9deb6
Fix: The scale was hardcoded.
...
Comment in english
2014-01-04 12:40:13 +01:00
Laurent Destailleur
6c3c66c45d
New: Add menu entry to barcode genration page.
2014-01-04 12:29:20 +01:00
Laurent Destailleur
bea74e54c8
Fix: The scale was hardcoded.
...
Comment in english
2014-01-04 12:26:31 +01:00
Marcos García de La Fuente
694fd5810a
Removed unuseful opensurvey admin page
2014-01-03 00:44:56 +01:00
Laurent Destailleur
601b2744e0
Merge remote-tracking branch 'origin/3.4' into 3.5
...
Conflicts:
build/debian/changelog
2014-01-03 00:16:29 +01:00
Laurent Destailleur
4a4084e096
Fix: doxygen
2014-01-03 00:13:16 +01:00
Laurent Destailleur
76f890b72f
Fix: Call Image on this instead of pdf.
...
Fix: Missing parameter for photo.
Conflicts:
htdocs/core/modules/member/doc/pdf_standard.class.php
htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
2014-01-02 20:51:39 +01:00
Laurent Destailleur
0b3dd9d7bb
Fix: Call Image on this instead of pdf.
...
Fix: Missing parameter for photo.
Conflicts:
htdocs/core/modules/member/doc/pdf_standard.class.php
htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
2014-01-02 20:49:36 +01:00
Laurent Destailleur
5551a5d4b4
Fix: Call Image on this instead of pdf.
...
Fix: Missing parameter for photo.
2014-01-02 20:45:59 +01:00
Marcos García de La Fuente
44ab26698e
Fixed (again) quality code control checks
2014-01-02 16:41:23 +01:00
Laurent Destailleur
504b519fb7
Fix: Bad link for download file into documents page of supplier invoices
2014-01-01 18:37:06 +01:00
Laurent Destailleur
5fd47b34b0
Fix: Bad link for download file into documents page of supplier invoices
2014-01-01 18:30:32 +01:00
Laurent Destailleur
eadccb5d9b
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/langs/bg_BG/main.lang
htdocs/langs/el_GR/cron.lang
htdocs/langs/el_GR/help.lang
htdocs/langs/el_GR/main.lang
htdocs/langs/el_GR/margins.lang
htdocs/langs/el_GR/stocks.lang
htdocs/langs/el_GR/suppliers.lang
htdocs/langs/et_EE/admin.lang
htdocs/langs/et_EE/agenda.lang
htdocs/langs/et_EE/banks.lang
htdocs/langs/et_EE/bills.lang
htdocs/langs/et_EE/commercial.lang
htdocs/langs/et_EE/companies.lang
htdocs/langs/et_EE/compta.lang
htdocs/langs/et_EE/dict.lang
htdocs/langs/et_EE/help.lang
htdocs/langs/et_EE/main.lang
htdocs/langs/et_EE/margins.lang
htdocs/langs/et_EE/other.lang
htdocs/langs/et_EE/stocks.lang
htdocs/langs/et_EE/suppliers.lang
htdocs/langs/et_EE/users.lang
htdocs/langs/et_EE/withdrawals.lang
htdocs/langs/lv_LV/admin.lang
htdocs/langs/lv_LV/agenda.lang
htdocs/langs/lv_LV/banks.lang
htdocs/langs/lv_LV/bills.lang
htdocs/langs/lv_LV/boxes.lang
htdocs/langs/lv_LV/opensurvey.lang
htdocs/langs/lv_LV/users.lang
htdocs/langs/ro_RO/admin.lang
htdocs/langs/ro_RO/banks.lang
htdocs/langs/ro_RO/bills.lang
htdocs/langs/ro_RO/companies.lang
htdocs/langs/ro_RO/compta.lang
htdocs/langs/ro_RO/cron.lang
htdocs/langs/ro_RO/dict.lang
htdocs/langs/ro_RO/help.lang
htdocs/langs/ro_RO/main.lang
htdocs/langs/ro_RO/margins.lang
htdocs/langs/ro_RO/other.lang
htdocs/langs/ro_RO/stocks.lang
htdocs/langs/ro_RO/suppliers.lang
htdocs/langs/ro_RO/withdrawals.lang
htdocs/langs/uz_UZ/main.lang
2013-12-31 12:18:31 +01:00
Laurent Destailleur
e142bd252d
Fix: disable code making jmobile crazy.
2013-12-31 10:48:15 +01:00
Laurent Destailleur
f0151ce112
Merge remote-tracking branch 'origin/3.5' into develop
2013-12-30 12:44:46 +01:00
Laurent Destailleur
cfb791c584
Fix: Better translation
2013-12-29 19:30:11 +01:00
Marcos García de La Fuente
9b90e93fe5
Forgot typehinting for function payment_supplier_prepare_head
2013-12-28 23:24:24 +01:00
Marcos García de La Fuente
c6ded35d4b
Fixed quality control checks for PR #1357
2013-12-28 23:13:32 +01:00
Laurent Destailleur
49f3242796
Merge pull request #1357 from marcosgdf/payment_menu
...
Payment menu
2013-12-26 16:19:49 -08:00
Laurent Destailleur
0e62d79ce2
Merge remote-tracking branch 'origin/3.5' into develop
2013-12-26 19:43:31 +01:00
Marcos García de La Fuente
917ddf0dee
Payments and Supplier payment pages tabs can now be extended from modules.
2013-12-25 03:16:57 +01:00
Laurent Destailleur
fcfe94d4ec
Merge remote-tracking branch 'origin/3.4' into 3.5
...
Conflicts:
htdocs/product/liste.php
2013-12-24 16:28:27 +01:00
Laurent Destailleur
ec1aef0191
Fix: Can import contacts not linked to any thirdparties.
2013-12-24 16:11:23 +01:00
Laurent Destailleur
9e5e74cb58
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/fourn/commande/fiche.php
htdocs/langs/es_ES/admin.lang
htdocs/langs/es_ES/languages.lang
htdocs/langs/es_ES/main.lang
2013-12-19 21:03:15 +01:00
Laurent Destailleur
b35f44e3cb
New: Add option MAIN_HIDE_INACTIVETAB_ON_PRINT to hide inactive tabs
...
when you use the "print" view on screen.
2013-12-19 20:57:13 +01:00
Laurent Destailleur
11e0fb8f7a
Fix: Missing ref field into export.
2013-12-17 09:11:36 +01:00
Laurent Destailleur
1dca56c213
Fix: Calculation of number of linked files was not working on taxes.
2013-12-16 23:45:12 +01:00
Laurent Destailleur
ca36a4dd97
Merge pull request #1348 from atm-alexis/3.5
...
Improper use of delete() function and ldap with multientity bug corrections
2013-12-16 05:26:31 -08:00
Alexis Algoud
ba70794c1d
Add multicompany->enabled test
2013-12-16 09:45:38 +01:00
Laurent Destailleur
6946fdbcda
Merge remote-tracking branch 'origin/3.5' into develop
2013-12-16 00:09:29 +01:00
Laurent Destailleur
7864fe3cfd
Merge remote-tracking branch 'origin/3.4' into 3.5
...
Conflicts:
htdocs/core/tpl/objectline_edit.tpl.php
2013-12-16 00:07:50 +01:00
Laurent Destailleur
6e9b8dc77a
Fix: Missing special code
2013-12-15 21:10:39 +01:00
Laurent Destailleur
3c87e1e20d
Fix: no required class for not mandatory fields
2013-12-15 18:11:56 +01:00
Laurent Destailleur
ef2f8ea67d
Removed some FIXME
2013-12-15 14:26:27 +01:00
Laurent Destailleur
c34e50114a
Start to work on a basic print sticker tool
2013-12-15 03:23:10 +01:00
Laurent Destailleur
fbeb61861a
Start to remove too low level permission. Philisophy of dolibarr is
...
having a minum of permission. Starting to include one permission for
each field we manage should not be into core.
Also activation of "skype" field in a future should probably be
rewritten to support as several communication id (chat, skype,
hanghout) with only one feature.
2013-12-14 20:58:03 +01:00
Laurent Destailleur
dc754bbdc2
Fix: Trigger name conflicts and reference file was not matching real
...
name of triggers.
2013-12-14 20:48:34 +01:00
Laurent Destailleur
db10740e2a
Merge pull request #1344 from GPCsolutions/feature/multicompanybookmarks
...
Feature/multicompanybookmarks
2013-12-13 18:52:38 -08:00
Laurent Destailleur
eaf151d7f5
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/.gitignore
htdocs/contact/fiche.php
2013-12-14 03:13:46 +01:00
Laurent Destailleur
42f032ded3
Merge remote-tracking branch 'origin/3.4' into 3.5
2013-12-14 01:30:15 +01:00
Laurent Destailleur
8d872ab4fb
Uniformize code and more comments
2013-12-14 00:24:43 +01:00
Laurent Destailleur
2f5932026e
More information returned into return code
2013-12-13 18:33:05 +01:00
Laurent Destailleur
9a07f31a8c
Doxygen
...
Bad translation
2013-12-13 17:36:43 +01:00
Alexis Algoud
4844aed67e
Merge branch '3.5' of https://github.com/Dolibarr/dolibarr into 3.5
2013-12-11 15:15:30 +01:00
Regis Houssin
0247241277
Fix: wrong path with multicompany module
2013-12-11 12:23:36 +01:00
Laurent Destailleur
286bdf91d4
Better detection of corrupted module files.
2013-12-10 18:52:48 +01:00
Laurent Destailleur
c3c6588426
Better detection of corrupted module files.
2013-12-10 16:25:27 +01:00
Laurent Destailleur
65593bce34
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-12-10 15:51:16 +01:00
Laurent Destailleur
8fb0986303
New: Add path file of trigger into admin trigger list page
2013-12-10 15:49:57 +01:00
Raphaël Doursenaud
071dd8e758
Make bookmarks module multicompany aware
2013-12-10 12:00:42 +01:00
Laurent Destailleur
f804833b9c
Merge remote-tracking branch 'origin/3.4' into 3.5
...
Conflicts:
htdocs/core/modules/modFacture.class.php
2013-12-08 22:38:10 +01:00
Laurent Destailleur
825640d645
Fix: Missing special code into export
2013-12-08 21:24:59 +01:00
Laurent Destailleur
3c0c9019b5
Comment
2013-12-08 15:40:22 +01:00
Laurent Destailleur
37b0780523
Merge remote-tracking branch 'origin/3.4' into 3.5
...
Conflicts:
ChangeLog
htdocs/comm/propal.php
htdocs/ecm/tpl/builddatabase.tpl.php
htdocs/fourn/commande/liste.php
htdocs/product/admin/product_tools.php
2013-12-08 00:42:36 +01:00
Laurent Destailleur
0e819ab5cd
Fix: Missing test
2013-12-07 16:43:35 +01:00
Laurent Destailleur
598a241366
Fix: minor css.
...
Fix: Alignement of screenshot was wrong. Wrapping too.
2013-12-06 10:23:26 +01:00
Laurent Destailleur
4d9712ea4c
Merge pull request #1318 from csalvador/develop-fichinterPDF
...
Develop fichinter pdf
2013-12-04 09:41:13 -08:00
Laurent Destailleur
24ce511671
Fix: [ bug #1167 ] Supplier IBAN account number set but no account
...
specified warning
2013-12-04 18:20:58 +01:00
Florian Henry
c2a8967b52
Much better fix for translated product description into PDF
2013-12-03 17:06:19 +01:00
Laurent Destailleur
6c7e173bba
Fix: jmobile broken with css tagtable, tagtr and tagtd
2013-12-02 22:31:02 +01:00
Alexis Algoud
bb191021de
Add entitytotest test, because a LDAP user can override the entity restriction without this test
2013-12-02 16:04:30 +01:00
Alexis Algoud
38c7c609bc
Error on mercure bill's number function.
...
Ex draft bill for november :
mask = FC{yy}{mm}{000@99}
{mm} = 11
On validation, number -> FC131160 instead of FC131112
2013-12-02 11:42:39 +01:00
Florian Henry
3e712c9c8c
Finnaly make it works
2013-12-02 11:11:08 +01:00
Florian Henry
0907d81fcb
Avoid strpos bug if string is empty or null
2013-12-02 11:05:07 +01:00
Florian Henry
1ad1b25f6e
remove useless space
2013-12-02 10:29:58 +01:00
Florian Henry
1b38d36f28
Better Fix
2013-12-02 10:27:41 +01:00
Florian Henry
c0ef63fd74
Bteer fix
2013-12-02 00:22:49 +01:00
Florian Henry
ff9c84fd0e
Better test for HTMLentities desc translation
2013-12-02 00:20:50 +01:00
Florian Henry
c6991f97d4
[ bug #1174 ] Product translated description not good into PDF
...
Country
2013-12-01 22:47:22 +01:00
Laurent Destailleur
0b9e8d6832
Fix: Alignement
2013-12-01 19:41:41 +01:00
Laurent Destailleur
e9e94b9e47
Fix: Alignement
2013-12-01 19:39:21 +01:00
Laurent Destailleur
b6386a3dce
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/core/tpl/objectline_add.tpl.php
2013-12-01 16:08:03 +01:00
Laurent Destailleur
519919889c
Fix comment
2013-11-30 16:57:11 +01:00
Cédric Salvador
22d31817de
made getVATRates synchronous to avoid concurrency problems
2013-11-29 12:13:23 +01:00
Laurent Destailleur
e27d109f2d
Merge pull request #1328 from csalvador/develop-fixAJAX
...
Develop fix ajax
2013-11-29 02:59:11 -08:00
Grand Philippe
c0650d6da3
Merge branch '3.5' of https://github.com/Dolibarr/dolibarr into 3.5
2013-11-29 08:30:46 +01:00
Laurent Destailleur
ea51e9ec77
Merge remote-tracking branch 'origin/3.5' into develop
2013-11-28 18:57:43 +01:00
Laurent Destailleur
d0b05bb5af
Fix: Restore style code lost by a commit.
2013-11-28 18:55:36 +01:00
Laurent Destailleur
5715e9c986
Merge remote-tracking branch 'origin/3.5' into develop
2013-11-28 17:06:11 +01:00
Grand Philippe
5b2f9af7dc
fix management of all errors messages
2013-11-28 16:44:57 +01:00
Laurent Destailleur
bdf8100d84
Merge remote-tracking branch 'origin/3.4' into 3.5
...
Conflicts:
htdocs/core/lib/agenda.lib.php
htdocs/product/stats/commande_fournisseur.php
2013-11-28 15:54:12 +01:00
Cédric Salvador
ec3fc4e6e6
indentation
2013-11-28 15:53:28 +01:00
Cédric Salvador
2da88a2966
made getVATRates synchronous to avoid concurrency problems
2013-11-28 15:52:26 +01:00
Laurent Destailleur
88ae0a7945
Fix: the rename function is bugged with some windows. I add a
...
workaround.
Fix: Add also a workaround for [ bug 1064 ] Date/Time in ICS incorrect.
2013-11-28 12:58:02 +01:00
Laurent Destailleur
b71406f12d
Merge pull request #1322 from aspangaro/develop
...
Improvement of the Skype button
2013-11-26 07:29:37 -08:00
Laurent Destailleur
0383dc4706
Fix: 2 bugs during validation of a member
2013-11-26 13:10:00 +01:00
Laurent Destailleur
854cfc741e
Fix: 2 bugs during validation of a member
2013-11-26 13:04:15 +01:00
aspangaro
e1b4d01235
Improvement of the Skype button
...
Perm & add a button"Chat"
2013-11-24 21:28:15 +01:00
Florian Henry
8f9143cef7
revert param_ihm
2013-11-24 18:07:40 +01:00
Laurent Destailleur
73408479ba
Merge remote-tracking branch 'origin/3.5' into develop
2013-11-24 13:19:41 +01:00
Laurent Destailleur
aa3c16b6af
Fix: chars were lost by function
2013-11-23 16:34:08 +01:00
Laurent Destailleur
8e313ef32d
Fix: Can add ban record but was not possible to delete
2013-11-23 16:17:20 +01:00
Laurent Destailleur
64031f92fa
Fix: Problem with W3C and wrapping of some title lines.
2013-11-23 14:50:13 +01:00
Laurent Destailleur
4b16551f88
Merge pull request #1316 from defrance69/patch-20
...
Update modAgenda.class.php
2013-11-23 05:05:55 -08:00
Laurent Destailleur
a171c40531
Merge pull request #1317 from GPCsolutions/develop-fixaddline
...
Made update price synchronous to avoid dependency hell
2013-11-23 05:03:01 -08:00
Florian Henry
f852c9a5bb
Fix [ bug #1145 ] Agenda button list type do not display
2013-11-22 14:43:15 +01:00
Laurent Destailleur
04fdfb4047
Fix: Problem with W3C and wrapping of some title lines.
2013-11-22 11:45:42 +01:00
Cédric Salvador
2b6a5508c7
debug the Soleil model
2013-11-22 09:51:48 +01:00
Cédric Salvador
c73057ead9
show page number
2013-11-22 09:51:48 +01:00
Cédric Salvador
eb04d8b076
show signature space on the last page only
2013-11-22 09:51:47 +01:00
Raphaël Doursenaud
302a230bf2
Made update price synchronous to avoid dependency hell
2013-11-21 18:00:27 +01:00
BENKE Charles
1bb7ddc2b1
Update modAgenda.class.php
...
export extensions
2013-11-21 17:32:11 +01:00
Florian Henry
7f950d8b45
Fix user pram_ihm, display tab and allow modify button only is user
...
right allow it is OK
2013-11-21 12:28:51 +01:00
Laurent Destailleur
358175b357
Merge remote-tracking branch 'origin/3.4' into develop
2013-11-20 23:48:06 +01:00
Laurent Destailleur
cb539399a0
Merge pull request #1302 from FHenry/develop
...
Fix output of extrafield select list from table
2013-11-20 14:42:50 -08:00
Florian Henry
f88e9425ec
Remove useless code (the tag replacement into footer and header is
...
already done by SetVar method)
2013-11-20 14:01:43 +01:00
Regis Houssin
4c29bddfda
Fix: wrong variable name
...
Fix: restore address.class.php, this class is used
2013-11-20 09:40:56 +01:00
Florian Henry
ed21b573ea
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-11-20 00:46:50 +01:00
Laurent Destailleur
69f0d596ba
Fix: Pagination
2013-11-18 12:20:53 +01:00
Laurent Destailleur
4356496ee8
Qual: File is not a class of a module
2013-11-18 00:20:05 +01:00
Laurent Destailleur
6a5b3e2020
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-11-17 23:26:37 +01:00
Laurent Destailleur
48570f599a
Fix: form is not allowed into a table. This break some javascript and
...
make some browsers crazy.
2013-11-17 23:25:25 +01:00
Florian Henry
a2368daa57
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-11-17 17:07:00 +01:00
Laurent Destailleur
0f4ceca8ec
Fix: tons of bugs into ecm module
2013-11-17 02:59:01 +01:00
Laurent Destailleur
45aac81b71
Doc: More comments
2013-11-16 18:12:13 +01:00
Laurent Destailleur
8ec50fce23
Move warning at correct place.
...
Fix: Reset of amount was not working
2013-11-16 14:26:42 +01:00
Laurent Destailleur
b7190d2609
Fix: Several bugs.
2013-11-16 13:00:21 +01:00
Laurent Destailleur
5b243abe4b
Fix: Miscellaneous fixes
2013-11-16 12:00:08 +01:00
Florian Henry
7696730680
Fix output of extrafield select list from table (in case of filter with
...
extrafields table)
2013-11-15 15:44:04 +01:00
Laurent Destailleur
c324f6a9a3
Merge pull request #1295 from FHenry/develop
...
Display customer code (according setting) into list
2013-11-15 05:05:36 -08:00
Laurent Destailleur
b3a1d695cd
Qual: Better message for total of buying price
...
Fix: Little debug of add link feature. Link was broken because of
missing http, fix W3C making output wrong with some browsers.
2013-11-15 11:43:16 +01:00
Laurent Destailleur
2e5320a532
Qual: Clean and uniformize code
2013-11-13 23:35:33 +01:00
Laurent Destailleur
cf3d6d410c
Fix: Use correct css
2013-11-13 21:50:16 +01:00
Florian Henry
fe0006c71d
Merge from dev
2013-11-13 21:34:02 +01:00
Florian Henry
a8e31ad956
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/core/lib/company.lib.php
Change-Id: Iec6a98430bfd500defda256862a1ed7869ef407a
2013-11-13 21:33:12 +01:00
Laurent Destailleur
588a30fa80
Fix: Bad status
2013-11-13 21:14:11 +01:00
Laurent Destailleur
5a8f4905d6
Fix: bad link into ecm module
2013-11-13 20:36:07 +01:00
Laurent Destailleur
d57aa65d30
Fix: Add option to fix warning not visible when there is preactivated
...
modules
2013-11-13 18:45:36 +01:00
Florian Henry
652d7db0b4
Get Status from getLibStatus !
2013-11-13 17:26:29 +01:00
Florian Henry
6d8871b4cf
Add filter on show_contact company.lib.php
2013-11-13 17:02:30 +01:00
aspangaro
86a2da31b4
Fix for document cerfa into module Don
2013-11-10 06:52:20 +01:00
aspangaro
6b6855dff5
Fix for document cerfa into module Don
2013-11-10 06:37:08 +01:00
Raphaël Doursenaud
1fc2e495ba
Moved unreachable statement
2013-11-08 14:42:28 +01:00
Raphaël Doursenaud
b6eecb0394
Developer documentation fix
2013-11-07 22:14:43 +01:00
Raphaël Doursenaud
9faa832560
Wrong var
2013-11-07 22:11:43 +01:00
Raphaël Doursenaud
8e1fd7a083
PHP doesn't know reals, use float
2013-11-07 21:48:46 +01:00
Raphaël Doursenaud
e514b50d7e
Typo fix
2013-11-07 21:48:45 +01:00
Raphaël Doursenaud
c845124b92
Object type is lowercase
2013-11-07 21:47:13 +01:00
Raphaël Doursenaud
01ea84a917
Static members are not always strings
...
Update method documentation to reflect the mixed type expected
2013-11-07 21:47:13 +01:00
Raphaël Doursenaud
d5ab0723ba
Timestamp is not a type
...
Timestamps are integers so let's document this correctly
2013-11-07 21:47:13 +01:00
Raphaël Doursenaud
fa43476890
Fixed methods description
...
These methods were declared void but actually returns values. Added proper documentation.
2013-11-07 21:02:50 +01:00
Laurent Destailleur
cf8ff25d5b
Minor enhancement with link feature
2013-11-07 02:56:56 +01:00
Laurent Destailleur
b2308ba65c
Merge pull request #1284 from GPCsolutions/links
...
Links
2013-11-06 17:15:49 -08:00
Laurent Destailleur
4a29431b69
New: Add hidden option MAIN_SECURITY_HASH_ALGO to choose hash function
2013-11-06 16:32:25 +01:00
Raphaël Doursenaud
f11f9b0a69
Added missing copyright
2013-11-06 10:33:29 +01:00
Raphaël Doursenaud
81ecb4b4a5
Updated method call to new prototype
2013-11-06 10:26:09 +01:00
Cédric Salvador
00c9df670c
renamed templates
2013-11-06 10:22:01 +01:00
Cédric Salvador
c3108f452c
copyrights
2013-11-06 10:20:11 +01:00
Cédric Salvador
039bd5b4c8
checkstyle
2013-11-06 10:20:11 +01:00
Cédric Salvador
b9c36e6e0a
checkstyle
2013-11-06 10:20:11 +01:00
Cédric Salvador
4d490ea02b
open link in new tab
2013-11-06 10:19:17 +01:00
Cédric Salvador
b34a613504
code formating
2013-11-06 10:19:17 +01:00
Cédric Salvador
f2535d74ea
edit link lines function
2013-11-06 10:19:17 +01:00
Cédric Salvador
b158e8bb74
translations
2013-11-06 10:19:17 +01:00
Cédric Salvador
b625b1843e
add a field for label input
2013-11-06 10:19:17 +01:00
Cédric Salvador
f19e5e86f4
don't try to create a link when the link input field is empty
2013-11-06 10:19:17 +01:00
Cédric Salvador
ce19b6da5c
typo
2013-11-06 10:19:17 +01:00
Cédric Salvador
dcf051605a
delete function for links
2013-11-06 10:19:16 +01:00
Cédric Salvador
28bfb10dbd
UI
2013-11-06 10:19:16 +01:00
Cédric Salvador
c96b2d3b87
factorized form attach, documents list and links list for the document pages
2013-11-06 10:19:16 +01:00
Cédric Salvador
3529f5238b
display links
2013-11-06 10:17:18 +01:00
Cédric Salvador
e8e3752626
link creation in dol_add_file_process
2013-11-06 10:17:17 +01:00
Cédric Salvador
d47bb95b56
bugfix
2013-11-06 10:11:40 +01:00
Cédric Salvador
3f774adbd0
form to link a file
2013-11-06 10:11:40 +01:00
Cédric Salvador
23008c3b31
factorized document actions
...
Conflicts:
htdocs/societe/document.php
2013-11-06 10:11:40 +01:00
Laurent Destailleur
27b33cafe6
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-11-05 19:54:58 +01:00
Laurent Destailleur
addedb6f15
Merge branch 'develop' of https://github.com/FHenry/dolibarr into
...
FHenry-develop
Conflicts:
htdocs/core/class/extrafields.class.php
2013-11-05 19:53:49 +01:00
Grand Philippe
a14de0c035
fix : language
2013-11-05 15:29:33 +01:00
Laurent Destailleur
a9a2bd9eec
Fix error reported by travis.
2013-11-05 14:39:25 +01:00
Laurent Destailleur
b18e125143
Merge pull request #1279 from aspangaro/skype
...
Task 157 : add a Skype button
2013-11-05 05:33:33 -08:00
Laurent Destailleur
223e50276c
Fix: Info tab was wrong with interventions
2013-11-05 14:24:37 +01:00
Laurent Destailleur
190dabc3f7
Fix: Tons of bugs with extrafields feature.
2013-11-05 13:11:36 +01:00
Florian Henry
0d2a019c3f
Extrafield : better filter on select from table management for
...
extrafields table
2013-11-05 11:26:13 +01:00
Laurent Destailleur
922929fffb
Fix: Missing column
...
Fix: Line was not added correctly
Fix: Missing message
2013-11-05 11:17:54 +01:00
aspangaro
76263213ab
Merge branch 'origin/develop'
2013-11-04 22:04:36 +01:00
aspangaro
8fd021bf36
Merge branch 'upstream/develop'
2013-11-04 21:44:58 +01:00
aspangaro
d79ba9695a
Task 157 : Add a skype button
2013-11-04 21:41:36 +01:00
Florian Henry
35c0695513
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-11-04 19:21:26 +01:00
Florian Henry
a57afb6d40
[ task #1127 ] Add feature filter on extrafield type : select for table
2013-11-04 19:21:13 +01:00
Laurent Destailleur
c815bd96fb
Doxygen
2013-11-04 16:50:41 +01:00
Laurent Destailleur
fd168c1214
Doc comments
2013-11-04 15:04:04 +01:00
Laurent Destailleur
f1c398f93c
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-11-04 10:57:04 +01:00
Laurent Destailleur
32983b79ee
Sec: Add option to salt password
2013-11-04 10:47:24 +01:00
Laurent Destailleur
e5fd19ffc0
Add option to salt hash passwords
2013-11-04 10:45:43 +01:00
Laurent Destailleur
469dd03673
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
build/debian/changelog
build/exe/doliwamp/doliwamp.iss
build/makepack-dolibarr.pl
build/rpm/dolibarr_fedora.spec
build/rpm/dolibarr_generic.spec
build/rpm/dolibarr_mandriva.spec
build/rpm/dolibarr_opensuse.spec
htdocs/core/class/commonobject.class.php
htdocs/core/tpl/objectline_view.tpl.php
htdocs/filefunc.inc.php
htdocs/langs/nl_NL/margins.lang
2013-11-01 17:58:38 +01:00
Laurent Destailleur
f8e3a3e38a
Fix: Sub level of dir must not always be visible. So I added parameter
...
"showrelpart". Default value is old behaviour (only filenmae is
visible).
2013-11-01 17:36:22 +01:00
Laurent Destailleur
44a78ca884
Merge pull request #1262 from defrance69/patch-17
...
Update html.formfile.class.php
2013-10-31 04:49:01 -07:00
Laurent Destailleur
154a75cc39
Merge pull request #1268 from FHenry/develop
...
Add NL_nl translation for category contact
2013-10-31 04:38:52 -07:00
Laurent Destailleur
692aa66cad
Fix: Tons of bug with new field planned_workload
2013-10-30 21:44:04 +01:00
Laurent Destailleur
c51ff1d462
New: Add hidden option to disable log handlers.
2013-10-30 19:08:41 +01:00
Christophe Battarel
ba0273ccc4
fix bad rounding on margin calculation and display
2013-10-30 18:17:37 +01:00
Florian Henry
f512ef344a
Better managent of contact status and fix COMPANY_DONOTSEARCH_ANYWHERE
...
use every where before SOCIETE_DONOTSEARCH_ANYWHERE was used
2013-10-30 12:24:51 +01:00
Laurent Destailleur
b3a0510407
Fix: Allow text input for hour.
2013-10-30 11:57:32 +01:00
Laurent Destailleur
5b3ba85669
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop
Conflicts:
ChangeLog
2013-10-29 18:07:12 +01:00
Laurent Destailleur
70342c09b8
Fix: Better management of using ajax for upload form (to solve problem
...
when enabling ajax jquery multifile upload in some cases).
New: Add option to use a specific mask for uploaded filename
2013-10-29 17:52:13 +01:00
Laurent Destailleur
953f638cb4
New: Sort combo list for type of thirdparties.
2013-10-28 02:13:07 +01:00
Laurent Destailleur
93c5720579
New: Add path to installed dir of external modules + Name and web of
...
module provider.
2013-10-28 01:37:04 +01:00
Laurent Destailleur
c81bb60384
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/core/lib/pdf.lib.php
htdocs/public/cron/cron_run_jobs.php
2013-10-27 02:33:03 +02:00
Laurent Destailleur
197ae822d4
Merge pull request #1263 from FHenry/develop
...
Fix list propal and invoice to display customer ref if option is set
2013-10-26 17:13:07 -07:00
Laurent Destailleur
62bedffb49
Fix: Bad class for body
2013-10-27 02:10:53 +02:00
Laurent Destailleur
f67537799b
Fix: Wrong usage of new preoutput confirm box
2013-10-26 18:46:07 +02:00
Laurent Destailleur
966f135316
Fix: Migration must load new boxes
2013-10-26 16:18:28 +02:00
Florian Henry
c2def3d0b6
Fix bad display IE for checkbox extrafield readonly
2013-10-25 10:01:41 +02:00
Laurent Destailleur
16bcd6b5e5
Add error management to avoid blank page when there is no permission to
...
read file.
2013-10-23 19:19:54 +02:00
Laurent Destailleur
ca560b4f98
Fix: [ bug #1076 ] Shipment/Delivery PDFs
2013-10-23 18:02:16 +02:00
Laurent Destailleur
483138d195
Comments
2013-10-23 13:38:18 +02:00
Florian Henry
c86812339f
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-10-23 11:26:05 +02:00
Florian Henry
9804527216
Fix bug in option display account number in list
2013-10-23 11:25:42 +02:00
Laurent Destailleur
d542576d23
Fix: Menu entry into getmenu_div is clicable on all line.
2013-10-22 18:43:57 +02:00
Laurent Destailleur
1412f33c4e
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-10-22 00:37:15 +02:00
Laurent Destailleur
14717e6279
Comment
2013-10-22 00:30:55 +02:00
Laurent Destailleur
ec576c91cc
Enhance prototype for tables
2013-10-21 13:43:31 +02:00
BENKE Charles
15b1507c84
Update html.formfile.class.php
...
Add subfolders feature in GED managment
2013-10-20 20:58:38 +02:00
Laurent Destailleur
305ca25267
New: Add menu entry to page massstockmove.php
2013-10-20 14:05:51 +02:00
Grand Philippe
c773f21c2c
fix wrong call name
2013-10-19 12:50:18 +02:00
Laurent Destailleur
df930d08b2
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-10-18 14:03:35 +02:00
Laurent Destailleur
33b4c9fad7
Fix: Bug into xcal decode
2013-10-18 10:38:59 +02:00
Laurent Destailleur
bf3ca7a0f0
Fix: Avoid syntax error
2013-10-18 01:20:25 +02:00
Laurent Destailleur
bd06ee1abe
Prototyping for other table outputs (div or datatable)
2013-10-17 18:37:08 +02:00
Laurent Destailleur
0d36329336
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-10-14 15:56:42 +02:00
Regis Houssin
8daef9d99f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-10-12 11:58:57 +02:00
Regis Houssin
bc0f65b73c
Fix: reorder lines problem
...
Conflicts:
htdocs/core/class/commonobject.class.php
htdocs/core/class/html.form.class.php
2013-10-12 11:58:38 +02:00
Regis Houssin
8801d7a1eb
Fix: reorder lines problem
2013-10-12 11:54:37 +02:00
Laurent Destailleur
de97cd1812
Fix: json
2013-10-11 18:33:21 +02:00
Laurent Destailleur
559b75c49b
New: Add hidden option MAIN_FORCE_DEFAULT_STATE_ID.
2013-10-11 12:14:14 +02:00
Laurent Destailleur
b0e38f7619
Fix: Manage strange language code reported bu chrome browsers.
2013-10-11 10:01:47 +02:00
Laurent Destailleur
303cad162b
Qual: Show the rule name used to make calculation and link to change
...
rule.
2013-10-10 19:33:49 +02:00
Laurent Destailleur
f4a83f0851
Qual: Debug of replenishment feature
2013-10-09 20:30:49 +02:00
Maxime Kohlhaas
845deb9a63
Add multilang management in ODT models
2013-10-08 09:17:04 +02:00
Laurent Destailleur
141258f514
Merge remote-tracking branch 'origin/3.4' into develop
...
and fix syntax errors into sql requests.
Group by must ALWAYS contains fields that are not included into SUM or
COUNT
Conflicts:
htdocs/fourn/product/liste.php
htdocs/margin/agentMargins.php
htdocs/margin/customerMargins.php
htdocs/margin/productMargins.php
htdocs/margin/tabs/productMargins.php
2013-10-07 16:17:51 +02:00
Christophe Battarel
02278a399c
better margin calculation (especially for credit notes)
2013-10-05 10:29:22 +02:00
Laurent Destailleur
019c86dff0
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
ChangeLog
2013-09-28 13:26:52 +02:00
Laurent Destailleur
4cf84c4ea8
New: Add hidden option MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS
2013-09-28 13:24:58 +02:00
Laurent Destailleur
470ccba80a
Qual: Fix two awful code with hardcoded values. This remove also 2 TODO.
2013-09-26 15:41:04 +02:00
Laurent Destailleur
ca24b45aa9
Merge pull request #1101 from PaulPoulain/940-develop
...
940 develop
2013-09-26 05:00:57 -07:00
Laurent Destailleur
db7bcfd748
Fix: Sending email from thirdparty must add event into agenda if option
...
is on.
2013-09-25 21:36:40 +02:00
Laurent Destailleur
065c87d81c
Qual: uniformize code: property ->tel on objects is now ->phone
...
everywhere
2013-09-25 19:58:22 +02:00
Laurent Destailleur
60fbde02ac
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-09-25 19:08:01 +02:00
Laurent Destailleur
072247f1c8
Fix: Use correct translation key
2013-09-25 19:07:25 +02:00
Laurent Destailleur
c88072433c
Merge pull request #1244 from defrance69/patch-12
...
Update commonobject.class.php
2013-09-25 08:18:49 -07:00
Laurent Destailleur
d111ee97c2
Doc
2013-09-25 12:37:19 +02:00
BENKE Charles
1c988fc559
Update commonobject.class.php
2013-09-25 11:14:50 +02:00
BENKE Charles
f88470d3b8
Update html.formcompany.class.php
...
use paramter to select only active type of contact
2013-09-25 10:17:27 +02:00
BENKE Charles
b400803a2a
Update commonobject.class.php
...
add complementary param
2013-09-25 10:15:32 +02:00
Christophe Battarel
b197231c04
fix bad margin calculation for credit notes
2013-09-24 17:49:56 +02:00
Christophe Battarel
f13b9cec29
escape dialog title
2013-09-24 15:59:30 +02:00
Christophe Battarel
aa820d56ba
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
...
is reverts commit 8a4041e534
2013-09-24 15:52:19 +02:00
BENKE Charles
d978d64d59
Update commonobject.class.php
...
just the active type of contact
2013-09-24 14:19:52 +02:00
Laurent Destailleur
2088eaa6fd
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/comm/action/fiche.php
2013-09-24 13:17:58 +02:00
Laurent Destailleur
b6d5ebf81d
Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4
2013-09-24 11:02:01 +02:00
Laurent Destailleur
06f36fbfab
Fix: Bad permission check
2013-09-24 10:59:15 +02:00
Laurent Destailleur
99de8b22a3
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-09-23 19:59:52 +02:00
Laurent Destailleur
890c96355d
Check parameter to make bug detection seasier
2013-09-23 19:53:21 +02:00
Laurent Destailleur
6b2966794a
Do not show free text for thirdparty email send form
2013-09-23 14:35:22 +02:00
Laurent Destailleur
3fde695c94
Qual: Uniformise name of include files we use to share common code found
...
into Actions area of pages (controllers).
2013-09-23 13:22:28 +02:00
Laurent Destailleur
cb04b05e85
New: Can send an email from thirdparty card.
2013-09-23 13:17:31 +02:00
Laurent Destailleur
7ed5d5e543
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-09-23 11:25:06 +02:00
Laurent Destailleur
26bce0a385
Merge pull request #1207 from defrance69/patch-12
...
Update modProjet.class.php
2013-09-23 00:39:03 -07:00
Laurent Destailleur
31d3e419b2
Fix: doxygen
2013-09-23 09:35:16 +02:00
Laurent Destailleur
9a475e9ed2
New: Add method to use a dictionnary as a combo box.
2013-09-22 23:54:01 +02:00
Laurent Destailleur
b57ed72fc1
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/compta/facture.php
htdocs/core/modules/expedition/doc/pdf_expedition_merou.modules.php
htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
2013-09-22 20:01:33 +02:00
Laurent Destailleur
c2ba7956ab
Merge remote-tracking branch 'origin/3.3' into 3.4
...
Conflicts:
htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
2013-09-22 19:57:48 +02:00
Laurent Destailleur
ad09470f48
Fix: Better management of pdf generation when tcpdf not available.
2013-09-22 19:53:27 +02:00
Laurent Destailleur
b9aac118aa
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-09-21 12:31:38 +02:00
Laurent Destailleur
fd564f5c7d
Optimize cookie usage for boxes. Only 1 cookie per box, instead of 1
...
cookie
per
parameter.
2013-09-21 12:30:44 +02:00
Laurent Destailleur
dd0612099c
Qual: Uniformize fields departement_id into state_id
2013-09-20 14:35:58 +02:00
Cédric Salvador
81a9bc3960
checkstyle
2013-09-20 10:56:15 +02:00
Cédric Salvador
9fdac2aa8e
changed dol_htmlentities() parameters to match standard htmlentities()
2013-09-20 10:36:43 +02:00
Laurent Destailleur
3d62303d59
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
ChangeLog
build/debian/get-orig-source.sh
build/debian/watch
htdocs/fourn/ajax/getSupplierPrices.php
2013-09-19 01:02:53 +02:00
Laurent Destailleur
986794ad7f
Fix doxygen
2013-09-18 23:39:53 +02:00
Laurent Destailleur
491bd76c1b
Work on openif authentication mode
2013-09-18 21:22:24 +02:00
Laurent Destailleur
8526d34d3b
Fix: Calculation of second rounding method is available for supplier
...
invoices.
2013-09-18 16:46:54 +02:00
Maxime Kohlhaas
e3d4a7bc35
Fix : wrong contact list was used for cc and ccc in formmail
2013-09-18 13:36:22 +02:00
Laurent Destailleur
1e29a97a89
Fix: checkstyle
2013-09-17 21:12:34 +02:00
simnandez
f7299f1a28
[ task #1063 ] Allow edit localtaxes rate for thirds
2013-09-17 18:06:06 +02:00
simnandez
7f21e596dd
[ task #1063 ] Allow edit localtaxes rate for thirds. Init Works
2013-09-17 17:17:59 +02:00
Laurent Destailleur
09de33ad97
Merge pull request #1232 from GPCsolutions/pgsql-installer
...
Fixed SQL install script for PostgreSQL
2013-09-16 10:39:11 -07:00
Cédric Salvador
fc136d0d06
changed parameter
2013-09-16 14:17:53 +02:00
Cédric Salvador
d9a26d0aa9
natural search in list pages
2013-09-16 14:17:53 +02:00
Laurent Destailleur
9826b202e9
New: Provide both tags for string formated amount and numeric amount
...
into odt templates.
New: [ task #923 ] Localtax support for ODT templates
2013-09-16 12:42:01 +02:00
Christophe Battarel
33fbee51bd
ability to copy contact address to clipboard
2013-09-15 19:09:22 +02:00
Christophe Battarel
a100faa4b1
ability to copy contact address to clipboard
2013-09-15 18:33:20 +02:00
Christophe Battarel
775d259f88
Fix: Supplier price displayed on document lines and margin infos didnt take discount
2013-09-15 14:52:41 +02:00
Laurent Destailleur
b20b82df3d
Fix: we must use conf-currency as parameter of method price instead of
...
using langs->getCurrencySymbol
2013-09-15 13:04:38 +02:00
Laurent Destailleur
32d2615e93
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-09-15 12:18:35 +02:00
Laurent Destailleur
e970c01b1b
Code comment
...
Fix translation
2013-09-15 12:17:45 +02:00
simnandez
59783cf556
[ task #1060 ] Register fields localtax(1|2)_type into details tables
2013-09-15 11:52:57 +02:00
simnandez
4c7907b773
[ task #1060 ] Register fields localtax(1|2)_type into details tables
2013-09-15 11:47:31 +02:00
Laurent Destailleur
57dee255a2
Normalize code
2013-09-14 14:41:12 +02:00
Laurent Destailleur
4c1faf626e
Merge remote-tracking branch 'origin/3.4' into develop
2013-09-14 14:36:17 +02:00
Laurent Destailleur
914e167183
Fix: Bad sql request
2013-09-14 14:34:45 +02:00
BENKE Charles
5e9cb8a1d4
Update modProjet.class.php
...
add export_dependencies_array
2013-09-14 10:45:41 +02:00
BENKE Charles
085a8d68db
Update html.formother.class.php
...
bugfix
2013-09-14 10:41:36 +02:00
Laurent Destailleur
f2bdd8c1d8
Work on alternative vat calculation mode
2013-09-13 17:43:26 +02:00
Cédric Salvador
b21226f2b7
fixed fatal error
2013-09-12 16:39:18 +02:00
Raphaël Doursenaud
875f9d55c7
Fixed tinyint for PostgreSQL in a more generic way
2013-09-11 17:34:35 +02:00
Laurent Destailleur
74f8a19134
Qual: Make code simpler
2013-09-11 15:17:31 +02:00
Laurent Destailleur
4b2ee84ede
Merge pull request #1230 from GPCsolutions/deprecated-5.5
...
Deprecated in PHP 5.5
2013-09-11 06:09:26 -07:00
Raphaël Doursenaud
9636e1aafc
Replaced PHP 5.5 deprecated calls
2013-09-11 14:48:02 +02:00
Laurent Destailleur
0bb18cb05c
New: Can use tag {mm} before {yy} even when there is a reset into
...
numbering masks.
Qual: Enhance phpunit tests to include this case.
2013-09-11 14:18:56 +02:00
Laurent Destailleur
21d9aa2fe4
Fix: [ bug #1054 ] Customer Invoice Numbering failure
2013-09-11 11:01:02 +02:00
Laurent Destailleur
eb10093ae8
Fix: Regression detected by phpunit
2013-09-11 10:05:01 +02:00
Laurent Destailleur
fd17280521
Removed all checkstyle errors
2013-09-11 09:40:00 +02:00
simnandez
bc0356db1f
[ task #1060 ] Register fields localtax(1|2)_type into details tables
2013-09-10 18:32:03 +02:00
simnandez
634f70a74d
New: [ task #1060 ] Register fields localtax(1|2)_type into details
...
tables. Invoices
2013-09-10 17:07:38 +02:00
Laurent Destailleur
f195d59c9c
Try to fix false positive with dolgraph
2013-09-10 16:12:20 +02:00
Laurent Destailleur
21602b34a9
Try to fix false positive with dolgraph
2013-09-10 15:56:40 +02:00
Laurent Destailleur
7d2109f8e8
Try to fix false positive with dolgraph
2013-09-10 15:50:05 +02:00
Laurent Destailleur
e467d63a94
Try to fix false positive
2013-09-10 15:45:36 +02:00
Laurent Destailleur
9314859ead
More log to find bug
2013-09-10 15:21:56 +02:00
Laurent Destailleur
345aa33efd
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-09-10 14:20:15 +02:00
Laurent Destailleur
72557437ef
Checkstyle
2013-09-10 14:19:36 +02:00
Laurent Destailleur
38d3746c11
Merge pull request #1226 from GPCsolutions/dolidb
...
Added an abstract DolibDB class
2013-09-10 03:36:34 -07:00
Raphaël Doursenaud
5426db63ff
Added an abstract DolibDB class
2013-09-10 12:29:55 +02:00
Laurent Destailleur
598f6883a2
Doc comments
2013-09-10 11:39:20 +02:00
Laurent Destailleur
c147fc6016
Fix: checkstyle
...
Try phpcs into travis
2013-09-10 02:09:55 +02:00
Laurent Destailleur
2b8af33505
Fix: eof
2013-09-09 19:15:34 +02:00
Laurent Destailleur
d22985c5fa
More accurate log file
2013-09-09 12:23:15 +02:00
Laurent Destailleur
74a50d8d6c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-09-07 19:51:00 +02:00
Laurent Destailleur
bd24711b30
Fix: navigation of supplier invoices
2013-09-07 19:50:47 +02:00
Laurent Destailleur
3a8784a6de
Qual: Mutualize code
2013-09-07 19:08:08 +02:00
Laurent Destailleur
884965a679
Merge pull request #1218 from GPCsolutions/develop-review
...
Fixed bad copy-paste
2013-09-06 13:47:14 -07:00
Laurent Destailleur
91718bc902
Qual: Replace deprecated call ->form_confirm with ->formconfirm
2013-09-06 11:51:24 +02:00
Laurent Destailleur
87a4418baf
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-09-06 10:50:44 +02:00
Laurent Destailleur
9fa6d4ccdf
Fix: Avoid error for free products. Also add hidden otion to enable
...
this. In most cases, we don't want to do this.
2013-09-06 10:40:44 +02:00
Raphaël Doursenaud
ae36934746
Fixed bad copy-paste
2013-09-06 10:22:13 +02:00
Laurent Destailleur
38e4b0f9ac
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
build/debian/watch
2013-09-05 23:57:30 +02:00
Laurent Destailleur
d493dc8513
Merge pull request #1215 from GPCsolutions/develop-review
...
Develop review
2013-09-05 13:51:28 -07:00
Raphaël Doursenaud
36a281ce58
CSS fixes
2013-09-05 20:54:19 +02:00
Raphaël Doursenaud
8010389c08
Fixed wrong path in CSS
2013-09-05 20:29:06 +02:00
Raphaël Doursenaud
d39f2d655c
Typo fix: remove unwanted comma
2013-09-05 20:28:24 +02:00
Raphaël Doursenaud
0e8eddb470
Revert "Method should be static"
...
This reverts commit 4ca5bc3797
2013-09-05 19:00:00 +02:00
Raphaël Doursenaud
6e64e0e7be
Fixed gd calls for windows bitmap images
2013-09-05 17:56:28 +02:00
Juanjo Menent
15bb60c8a1
Merge pull request #1212 from FHenry/develop
...
Add ref supplier into muscadet model
2013-09-05 08:30:49 -07:00
Raphaël Doursenaud
cd684460ff
Removed silly code
2013-09-05 17:30:17 +02:00
Raphaël Doursenaud
4efe215b0c
Qual: removed a bunch of duplicated array keys
2013-09-05 17:00:18 +02:00
Raphaël Doursenaud
465d59ba82
Don't call non static class statically
2013-09-05 16:44:57 +02:00
Raphaël Doursenaud
4ca5bc3797
Method should be static
2013-09-05 16:44:02 +02:00
Raphaël Doursenaud
0c0740cac7
Don't call non static class statically
2013-09-05 16:43:22 +02:00
Raphaël Doursenaud
109cc09e82
Simplified JS
2013-09-05 16:37:23 +02:00
Laurent Destailleur
e40d644085
Fix: Remove warning
2013-09-04 16:49:20 +02:00
Laurent Destailleur
10c2bdc193
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/categories/class/categorie.class.php
htdocs/core/boxes/box_ficheinter.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/extrafields.class.php
htdocs/langs/fr_FR/compta.lang
2013-09-04 15:13:38 +02:00
Laurent Destailleur
af22d38681
Fix: Bad total without tax
2013-09-04 15:07:35 +02:00
Laurent Destailleur
ee0f44c9e3
Fix: Try a fix of cloning lines->array
2013-09-04 10:45:15 +02:00
Florian Henry
d8ddb8b3e7
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-09-03 20:07:13 +02:00
Florian Henry
b4d858828f
Add ref supplier into muscadet model
2013-09-03 20:07:08 +02:00
Laurent Destailleur
23df3d82e5
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-09-03 18:10:55 +02:00
Laurent Destailleur
3bfaadc054
Work on feature to change rule for vat calculation rounding
2013-09-03 18:08:50 +02:00
Juanjo Menent
7293d58002
Merge pull request #1208 from grandoc/develop
...
Add an additional description for the category products
2013-09-03 02:43:30 -07:00
Grand Philippe
6d6f30725b
Add an additional description for the category products
2013-09-03 11:41:33 +02:00
Laurent Destailleur
e40452f3b2
Fix: Bug if modules not enabled
2013-09-03 11:36:28 +02:00
Grand Philippe
dfdc9da781
Add an additional description for the category products
2013-09-03 11:15:19 +02:00
BENKE Charles
bb8f8332f9
Update modProjet.class.php
...
enhance export feature with
left join and projet_task_time data
2013-09-03 11:12:29 +02:00
Grand Philippe
da384dda18
uniformize
2013-09-02 11:53:07 +02:00
Laurent Destailleur
cb52af4f47
Qual: Make code more generic
2013-09-02 02:14:16 +02:00
Laurent Destailleur
b95aa1ac7b
Fix: select list on external table
...
Conflicts:
htdocs/core/class/extrafields.class.php
2013-09-02 00:41:14 +02:00
Laurent Destailleur
3a4896609a
Fix: Remove debug print
2013-09-02 00:38:13 +02:00
Laurent Destailleur
e6611b6ba1
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-09-02 00:34:55 +02:00
Laurent Destailleur
51cc957b97
Fix: select list on external table
2013-09-02 00:34:41 +02:00
Laurent Destailleur
1ba382d7a6
Merge pull request #1202 from FHenry/develop
...
Fix from remark on https://github.com/Dolibarr/dolibarr/pull/1103
2013-09-01 15:01:33 -07:00
Laurent Destailleur
1392f4e623
Merge pull request #1203 from PaulPoulain/966-develop
...
T966-develop : Put the poste of the contact in the list
2013-09-01 14:49:06 -07:00
Laurent Destailleur
8cd1563f58
More test
2013-09-01 20:55:59 +02:00
Laurent Destailleur
4272209832
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-08-31 12:44:13 +02:00
Laurent Destailleur
a8096c7359
New: Export/import profile include state.
2013-08-31 12:43:41 +02:00
Florian Henry
9ed5653ae5
[ task #1044 ] Add option to enabled thirdparty number into select
...
thirdparty list
2013-08-30 18:18:58 +02:00
Florian Henry
8b9b682eaf
Merge remote-tracking branch 'origin/develop' into develop
2013-08-30 18:11:47 +02:00
simnandez
2a8aa50163
Fix: Intervention box links to contracts id
...
Conflicts:
htdocs/core/boxes/box_ficheinter.php
2013-08-29 12:12:02 +02:00
simnandez
b86e20f0e6
Fix: Intervention box links to contracts id
2013-08-29 12:05:29 +02:00
simnandez
a321264a2a
Fix: Localtaxes balance not showing
...
Conflicts:
ChangeLog
2013-08-29 10:03:32 +02:00
simnandez
fa4a9c73c4
Fix: Localtaxes balance not showing
2013-08-29 09:58:07 +02:00
lalaina rasamoelina
3156f8cae0
Fix: [ bug #1043 ] Bad interventions ref numbering
2013-08-29 09:30:26 +02:00
Florian Henry
29396bd51a
Change SQL syntax
2013-08-28 18:05:31 +02:00
Florian Henry
34129598cb
adjust spacing
2013-08-28 16:50:38 +02:00
Florian Henry
650689d294
Fix from remark on https://github.com/Dolibarr/dolibarr/pull/1103
2013-08-28 16:49:22 +02:00
Florian Henry
cc90c92cc0
Fix: Mailing module : if an email is already in destinaires list all
...
other email from selector was not inserted
2013-08-28 16:33:21 +02:00
lalaina rasamoelina
ca6a973d96
T940-develop: creating a bouton which permit to create an event in the propal,and command .
...
If we create an event in the propal, then the events will be attached in the propal
and if it's for command,it will be attached in the command
2013-08-27 15:51:06 +02:00
Regis Houssin
841961df4e
Fix: wrong function name
2013-08-27 14:53:24 +02:00
Laurent Destailleur
657c4d6e90
Fix: Fix graph for product distribution.
...
Add limit and add entry other.
2013-08-27 11:54:07 +02:00
simnandez
34fe1fba7f
Fix: [ bug #1043 ] Bad interventions ref numbering
2013-08-27 09:45:24 +02:00
simnandez
dfd14f4430
Fix: [ bug #1043 ] Bad interventions ref numbering
2013-08-27 09:44:00 +02:00
Grand Philippe
24e6042378
some fix for contract model
2013-08-26 15:32:56 +02:00
Grand Philippe
7a64ad1a26
some fix for contract model and clean code
2013-08-26 14:29:46 +02:00
Laurent Destailleur
903b75c1cd
Merge pull request #1165 from PaulPoulain/975-develop
...
T975-develop: Don't print the mail of the contact who is gone
2013-08-25 03:23:26 -07:00
Laurent Destailleur
94d3e6d3cd
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php
2013-08-24 22:45:57 +02:00
Laurent Destailleur
70f7321d51
Comment
2013-08-24 22:45:02 +02:00
Laurent Destailleur
07cba2d232
Merge pull request #1194 from grandoc/develop
...
fix : warning during install
2013-08-24 13:43:36 -07:00
Laurent Destailleur
8c90ad8afa
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
ChangeLog
htdocs/core/class/commonobject.class.php
htdocs/core/class/html.formfile.class.php
htdocs/core/modules/expedition/doc/pdf_expedition_rouget.modules.php
htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
htdocs/core/modules/modFacture.class.php
htdocs/core/modules/modFournisseur.class.php
htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php
htdocs/expedition/fiche.php
htdocs/fourn/fiche.php
htdocs/langs/el_GR/admin.lang
htdocs/langs/el_GR/agenda.lang
htdocs/langs/el_GR/banks.lang
htdocs/langs/el_GR/bills.lang
htdocs/langs/el_GR/bookmarks.lang
htdocs/langs/el_GR/boxes.lang
htdocs/langs/el_GR/cashdesk.lang
htdocs/langs/el_GR/categories.lang
htdocs/langs/el_GR/commercial.lang
htdocs/langs/el_GR/companies.lang
htdocs/langs/el_GR/compta.lang
htdocs/langs/el_GR/contracts.lang
htdocs/langs/el_GR/cron.lang
htdocs/langs/el_GR/deliveries.lang
htdocs/langs/el_GR/dict.lang
htdocs/langs/el_GR/donations.lang
htdocs/langs/el_GR/ecm.lang
htdocs/langs/el_GR/errors.lang
htdocs/langs/el_GR/exports.lang
htdocs/langs/el_GR/externalsite.lang
htdocs/langs/el_GR/ftp.lang
htdocs/langs/el_GR/help.lang
htdocs/langs/el_GR/holiday.lang
htdocs/langs/el_GR/install.lang
htdocs/langs/el_GR/interventions.lang
htdocs/langs/el_GR/languages.lang
htdocs/langs/el_GR/ldap.lang
htdocs/langs/el_GR/mailmanspip.lang
htdocs/langs/el_GR/mails.lang
htdocs/langs/el_GR/main.lang
htdocs/langs/el_GR/margins.lang
htdocs/langs/el_GR/members.lang
htdocs/langs/el_GR/opensurvey.lang
htdocs/langs/el_GR/orders.lang
htdocs/langs/el_GR/oscommerce.lang
htdocs/langs/el_GR/other.lang
htdocs/langs/el_GR/paybox.lang
htdocs/langs/el_GR/paypal.lang
htdocs/langs/el_GR/products.lang
htdocs/langs/el_GR/projects.lang
htdocs/langs/el_GR/propal.lang
htdocs/langs/el_GR/sendings.lang
htdocs/langs/el_GR/shop.lang
htdocs/langs/el_GR/sms.lang
htdocs/langs/el_GR/stocks.lang
htdocs/langs/el_GR/suppliers.lang
htdocs/langs/el_GR/trips.lang
htdocs/langs/el_GR/users.lang
htdocs/langs/el_GR/withdrawals.lang
htdocs/langs/el_GR/workflow.lang
htdocs/margin/productMargins.php
2013-08-24 22:41:32 +02:00
Laurent Destailleur
6d2c27beec
Fix: header already sent
2013-08-24 22:09:32 +02:00
Laurent Destailleur
1c08cad6b9
Fix: Bad translation (to pick to 3.4)
...
Conflicts:
htdocs/langs/en_US/main.lang
htdocs/langs/fr_FR/main.lang
2013-08-24 21:41:36 +02:00
Laurent Destailleur
1c527b8db9
Merge remote-tracking branch 'origin/3.3' into 3.4
2013-08-24 20:59:02 +02:00
Laurent Destailleur
75bd05d212
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-08-24 19:36:17 +02:00
Grand Philippe
a0c04a548b
first step to complete contract functionalities
2013-08-24 15:59:49 +02:00
Grand Philippe
e56e0ebfb5
add extrafields
2013-08-24 13:49:55 +02:00
Grand Philippe
71a9e148b3
fix : warning during install
2013-08-24 11:34:34 +02:00
Juanjo Menent
376b2812fe
Merge pull request #1190 from altairis-fr/develop
...
add ability to modify margin rate on line edit if authorized
2013-08-23 00:18:08 -07:00
Laurent Destailleur
9da5f7f47a
Qual: Doxygen
2013-08-22 16:49:23 +02:00
Laurent Destailleur
c1dae58055
Fix: Bad translation (to pick to 3.4)
2013-08-22 12:46:10 +02:00
Christophe Battarel
4df216afbc
add ability to define margin when adding line with new experimental form
2013-08-22 12:13:14 +02:00
Christophe Battarel
f37c24f8ff
allow to modify margin rate or mark rate but not both
2013-08-22 11:45:27 +02:00
Christophe Battarel
e672783adb
add ability to modify margin rate on line edit if authorized
2013-08-22 11:39:55 +02:00
lalaina rasamoelina
8a4041e534
T975-develop Add an element (statut) in the table llx_socpeople
...
It's used to mark if the contact is gone or no(we can activate or desactivate the contact with this)
And if the contact is gone,we don't print her mail in the mail list,where we can send a mail
2013-08-22 11:04:06 +02:00
lalaina rasamoelina
1295c8d27b
Put the status of contact in the list of contact
2013-08-22 11:04:06 +02:00
lalaina rasamoelina
dc3ccf6373
Style of page
2013-08-22 11:04:06 +02:00
lalaina rasamoelina
5ed186e178
Delete the contact who are gone,in the email list
2013-08-22 11:04:06 +02:00
Laurent Destailleur
05040d1997
Fix: B1032-develop: Problem in the filter of Contact by company category
2013-08-21 22:42:08 +02:00
Laurent Destailleur
f0dee93f78
Fix: B1032-develop: Problem in the filter of Contact by company category
2013-08-21 22:34:13 +02:00
Laurent Destailleur
52d39915d7
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-08-21 22:21:33 +02:00
Laurent Destailleur
ea4ac30b28
Fix: more responsive box
2013-08-21 21:39:39 +02:00
Laurent Destailleur
327aa80ed0
Fix: Error management
...
New: Autoselect category in list if there is only one element in list.
2013-08-21 13:02:33 +02:00
Laurent Destailleur
c4bc10b8eb
Qual: Clean code by moving synchro with mailman into mailman trigger
...
New: A trigger can return an array of error strings instead of one error
string.
2013-08-21 12:39:20 +02:00
simnandez
913888824f
Remove duplicate $user
2013-08-20 12:26:39 +02:00
Christophe Battarel
4c7741f5f0
manage user permissions for margin display
2013-08-20 12:11:19 +02:00
Christophe Battarel
06b8e939bd
manage user permissions for margin rate
2013-08-20 12:04:01 +02:00
Christophe Battarel
220f9b7e9f
define global user variables so templates can manage user permissions
2013-08-20 12:01:52 +02:00
Christophe Battarel
8128ed0556
define user permissions on margin module
...
update changelog
2013-08-20 12:00:16 +02:00
Laurent Destailleur
e460aa335c
New: When there is no data on pie chart, can set color to an empty
...
value.
2013-08-20 11:51:24 +02:00
Laurent Destailleur
b18d5166de
Fix: Size of picture into PDF
2013-08-19 13:30:30 +02:00
Grand Philippe
49e38e1263
fix some trad
2013-08-16 10:16:06 +02:00
Juanjo Menent
8ba3410766
Merge pull request #1179 from altatof/saisie_marges
...
ability to define margin rate on quotes, orders, invoices
2013-08-14 01:00:29 -07:00
simnandez
3577025f0e
Fix update extrafield do not display immediatly
2013-08-14 09:56:08 +02:00
Florian Henry
60b3f61339
Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4
...
Conflicts:
ChangeLog
2013-08-13 12:13:47 +02:00
simnandez
5cbfa61731
Fix: [ bug #1033 ] SUPPLIER REF disappeared
2013-08-12 18:44:03 +02:00
simnandez
067c8c55b9
Fix: [ bug #1033 ] SUPPLIER REF disappeared
2013-08-12 18:42:01 +02:00
Christophe Battarel
29d329a1d2
ability to define margin rate on quotes, orders, invoices
...
more to come : same on edit, user permissions
2013-08-12 15:34:09 +02:00
Florian Henry
26d1352de4
Fix update extrafield do not display immediatly
2013-08-12 14:30:42 +02:00
Laurent Destailleur
3502747247
Merge pull request #1175 from FHenry/develop
...
Add pdf link into supplier invoice list and supplier order list
2013-08-09 12:18:40 -07:00
Laurent Destailleur
ff4ebe423b
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-08-09 19:21:32 +02:00
Laurent Destailleur
59c1f54d68
New: Enhance DolGraph class for pie charts.
2013-08-09 19:19:48 +02:00
Florian Henry
3cf3dbeb51
Add pdf link into supplier invoice list and supplier order list
2013-08-09 13:48:44 +02:00
Florian Henry
75701ee995
Fix: Supplier invoice and supplier order are not displayed into object
...
link into agenda event card
2013-08-09 13:11:18 +02:00
Laurent Destailleur
ecf8e06487
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-08-08 20:07:24 +02:00
Laurent Destailleur
bfd2d7ada2
Fix: Sort order works with special chars.
2013-08-08 20:06:56 +02:00
simnandez
6b1484c2ea
Fix: [ bug #992 ] Proforma invoices don't have a separated numeric count
2013-08-08 17:11:54 +02:00
Laurent Destailleur
4f9a1768d5
Work on graphical box with product distribution
2013-08-08 14:36:35 +02:00
simnandez
b9e1a57f67
Fix: [ bug #1029 ] Tulip numbering mask
2013-08-08 10:00:06 +02:00
Laurent Destailleur
2a0597a6d4
Merge pull request #1161 from PaulPoulain/948-develop
...
T948-develop :Classify Billed when the price of bill is greater than command
2013-08-07 16:48:32 -07:00
Laurent Destailleur
b1f528f4d5
Comment code of a deprecated variable.
2013-08-07 20:56:10 +02:00
Laurent Destailleur
0f86755033
Fix: Found a dozen of bugs into sub module delivery of module shipment.
...
Conflicts:
htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
htdocs/expedition/class/expedition.class.php
htdocs/expedition/fiche.php
2013-08-07 15:29:13 +02:00
Laurent Destailleur
d5a57f3717
Fix: Found a dozen of bugs into sub module delivery of module shipment.
2013-08-07 15:08:30 +02:00
Laurent Destailleur
4d67d02f33
Fix: Bad dir
2013-08-07 13:35:09 +02:00
Laurent Destailleur
539adfdcc4
Fix: Bad var name
2013-08-07 13:33:22 +02:00
Laurent Destailleur
4346a3f90f
Fix: Param must be a regex string
...
Conflicts:
htdocs/core/class/html.formfile.class.php
2013-08-06 19:34:13 +02:00
Laurent Destailleur
3caf119596
Fix: Param must be a regex string
2013-08-06 19:23:43 +02:00
lalaina rasamoelina
0fa4739d47
T948-develop :Classify Billed when the price of bill is greater than command
...
-In the workflow i've added on bouton which permitted
to classify billed when the price of bills is greater
than command,if her status is delivered
/htdocs/admin/workflow.php
2013-08-06 16:57:40 +02:00
Juanjo Menent
aab90bfe76
Merge pull request #1154 from atm-maxime/develop
...
Fix : supplier invoice mask + numbering
2013-08-06 06:37:32 -07:00
Maxime Kohlhaas
3586c41a8e
Numbering should be on invoice date, not creation date
2013-08-06 15:29:20 +02:00
Maxime Kohlhaas
08a3b0c905
Fix : supplier invoice mask + numbering
2013-08-06 15:27:51 +02:00
Laurent Destailleur
c3dd7c3b39
Fix: Tons of regression after renaming note field into note_private.
2013-08-06 13:22:35 +02:00
Laurent Destailleur
2750b1a298
Fix: Tons of regression after renaming note field into note_private.
...
Qual: Add phpunit test to test all exports descriptors.
2013-08-06 13:22:00 +02:00
Laurent Destailleur
91700d84a6
Fix: lang file
2013-08-06 03:56:59 +02:00
Laurent Destailleur
b7cada9a99
Fix: End of menu when no module selected.
2013-08-06 03:01:56 +02:00
Laurent Destailleur
afae841ae4
Fix: Permissions on files
2013-08-06 00:36:21 +02:00
Laurent Destailleur
c41a955cbe
Fix: Permissions on files
2013-08-06 00:36:04 +02:00
Laurent Destailleur
8d90289bfc
Merge pull request #1153 from csalvador/print_address_hook
...
added hook to the print address function
2013-08-05 11:51:08 -07:00
Laurent Destailleur
218e9f5b33
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-08-05 18:55:38 +02:00
Laurent Destailleur
928446596d
Perf: Optimize memory usage when generating graph.
2013-08-05 18:30:10 +02:00
Cédric Salvador
0127ed8b33
added hook to the print address function
2013-08-05 18:07:10 +02:00
Laurent Destailleur
85572a4bd1
New: Start to work on box for product distributions
...
Qual: Start to move code of dol_print_graph function into class
DolGraph.
2013-08-05 17:19:49 +02:00
Laurent Destailleur
447d0063af
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/langs/ca_ES/withdrawals.lang
htdocs/langs/es_ES/withdrawals.lang
htdocs/langs/fr_FR/withdrawals.lang
htdocs/langs/ja_JP/compta.lang
htdocs/langs/ja_JP/contracts.lang
htdocs/langs/sl_SI/withdrawals.lang
htdocs/langs/zh_CN/admin.lang
htdocs/langs/zh_CN/agenda.lang
htdocs/langs/zh_CN/bills.lang
htdocs/langs/zh_CN/boxes.lang
htdocs/langs/zh_CN/commercial.lang
htdocs/langs/zh_CN/companies.lang
htdocs/langs/zh_CN/compta.lang
htdocs/langs/zh_CN/contracts.lang
htdocs/langs/zh_CN/errors.lang
htdocs/langs/zh_CN/exports.lang
htdocs/langs/zh_CN/install.lang
htdocs/langs/zh_CN/interventions.lang
htdocs/langs/zh_CN/mails.lang
htdocs/langs/zh_CN/main.lang
htdocs/langs/zh_CN/members.lang
htdocs/langs/zh_CN/orders.lang
htdocs/langs/zh_CN/other.lang
htdocs/langs/zh_CN/products.lang
htdocs/langs/zh_CN/propal.lang
htdocs/langs/zh_CN/stocks.lang
htdocs/langs/zh_CN/suppliers.lang
htdocs/langs/zh_CN/users.lang
htdocs/langs/zh_TW/admin.lang
htdocs/langs/zh_TW/agenda.lang
htdocs/langs/zh_TW/banks.lang
htdocs/langs/zh_TW/boxes.lang
htdocs/langs/zh_TW/companies.lang
htdocs/langs/zh_TW/compta.lang
htdocs/langs/zh_TW/contracts.lang
htdocs/langs/zh_TW/errors.lang
htdocs/langs/zh_TW/exports.lang
htdocs/langs/zh_TW/install.lang
htdocs/langs/zh_TW/interventions.lang
htdocs/langs/zh_TW/mails.lang
htdocs/langs/zh_TW/members.lang
htdocs/langs/zh_TW/orders.lang
htdocs/langs/zh_TW/propal.lang
htdocs/langs/zh_TW/suppliers.lang
2013-08-03 16:24:52 +02:00
simnandez
283d9eb064
Text for invoices numbering modules more clear. Update ChangeLog
2013-08-02 15:27:37 +02:00
Laurent Destailleur
c18fed7e4c
New: A box can use a "or" on module conditions
2013-08-02 14:54:22 +02:00
Juanjo Menent
ba8d094ec5
Merge pull request #1152 from atm-maxime/develop
...
Better fix for email text / signature integration
2013-08-02 03:13:42 -07:00
simnandez
6d1a021382
New: [ task #1005 ] Update mercure module with replacement invoices.
2013-08-02 12:11:14 +02:00
simnandez
d0bd188e74
New: [ task #1005 ] Improves and best adaptations
2013-08-02 10:44:14 +02:00
Maxime Kohlhaas
a0738e86d8
Better fix for email text / signature integration
2013-08-02 10:24:09 +02:00
Laurent Destailleur
a35ee022f3
Merge pull request #1150 from atm-maxime/develop
...
Task # 1016 : deposits numbering
2013-08-01 13:06:46 -07:00
simnandez
d8fcec287b
Fix: Reverse mars-es_ES to mars. It is not a numbering only for Spain.
2013-08-01 18:44:21 +02:00
Laurent Destailleur
3730d874c9
Fix: [ bug #991 ] Error when adding a product in POS when no Tax is
...
associated to the country of the company
2013-08-01 18:09:01 +02:00
Laurent Destailleur
8b0169f468
Fix: [ bug #991 ] Error when adding a product in POS when no Tax is
...
associated to the country of the company
2013-08-01 18:01:25 +02:00
Laurent Destailleur
4f464eb226
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/core/modules/export/export_excel2007.modules.php
htdocs/langs/en_US/errors.lang
htdocs/langs/fr_FR/agenda.lang
htdocs/langs/fr_FR/errors.lang
2013-08-01 17:42:18 +02:00
Laurent Destailleur
1fb8baa92e
Fix: [ bug #1009 ] ZipArchive' not found
2013-08-01 16:56:17 +02:00
Maxime Kohlhaas
a6ef341ae7
Task # 1016 : can define a specific numbering for deposits
2013-08-01 16:30:31 +02:00
Laurent Destailleur
4786c90c4a
Fix: Pb into export descriptions
2013-08-01 15:30:27 +02:00
Laurent Destailleur
bd33e8a962
Fix: Export of country
2013-08-01 15:28:19 +02:00
Laurent Destailleur
98bd56e229
Fix: Pb into export descriptions
2013-08-01 15:26:01 +02:00
Laurent Destailleur
e6022527dd
Fix: Export of country
2013-08-01 12:49:46 +02:00
Laurent Destailleur
2fa1032079
Merge pull request #1145 from atm-maxime/develop
...
Fix : email message combined with html signature made troubles with line breaks
2013-08-01 02:09:52 -07:00
Laurent Destailleur
ba2c6d4d54
Fix: Confirm boxes with jmobile
2013-08-01 05:13:13 +02:00
Laurent Destailleur
53672dff75
Fix: Confirm boxes with jmobile
2013-08-01 04:20:08 +02:00
Laurent Destailleur
a334b96469
Optimize screen size
2013-08-01 02:28:47 +02:00
Florian Henry
325ceda4dc
[ task #1014 ] Add option to recursivly add parent cactegory
2013-07-31 21:52:49 +02:00
Maxime Kohlhaas
3395df2b66
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2013-07-31 15:23:27 +02:00
Laurent Destailleur
6e289874fe
Merge pull request #1146 from csalvador/callfix
...
fixed bad function call causing select_produits_list to fail
2013-07-31 05:52:19 -07:00
Laurent Destailleur
e234d5342d
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/contrat/liste.php
2013-07-31 12:45:39 +02:00
Cédric Salvador
f0bbdfddfb
fixed bad function call causing select_produits_list to fail
2013-07-31 10:08:33 +02:00
Maxime Kohlhaas
27cfe802aa
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2013-07-31 09:03:20 +02:00
Laurent Destailleur
75e2350e6a
Fix: Mutualizing code fix bug into duplicate code of contact management
...
for project.
2013-07-30 19:08:58 +02:00
Maxime Kohlhaas
c40e187842
Typo
2013-07-30 17:30:09 +02:00
Maxime Kohlhaas
dfae157cc5
Fix : email message combined with html signature made troubles with line breaks
2013-07-30 17:29:24 +02:00
Laurent Destailleur
57ce331833
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-07-30 17:23:13 +02:00
Laurent Destailleur
eeb8ef57c9
Fix: grip and close for title must differ from grip and close used for
...
other styles.
2013-07-30 17:22:52 +02:00
Maxime Kohlhaas
bfb01da04f
Merge branch 'develop' of github.com:Dolibarr/dolibarr into mko1011
2013-07-30 16:22:13 +02:00
Maxime Kohlhaas
dae36229a4
Task # 1011 : add payment terms and payment mode on supplier card
2013-07-30 15:06:57 +02:00
Florian Henry
21bdabc248
Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4
2013-07-30 14:19:05 +02:00
Florian Henry
3bc7d3c877
Fix extrafeild thirdparty import and export
2013-07-30 14:18:56 +02:00
Laurent Destailleur
a48236b304
Merge pull request #1139 from GPCsolutions/replenishment
...
Replenishment Task #918
2013-07-30 03:28:13 -07:00
Laurent Destailleur
1c24f9e35e
Merge pull request #1138 from atm-maxime/3.4
...
Fix : Numbering on supplier invoice was not saved and on shipment displa...
2013-07-30 03:22:29 -07:00
Cédric Salvador
370f6ac857
fixed select_product_fourn_price closes #43
2013-07-30 10:24:37 +02:00
Maxime Kohlhaas
f9c2910f84
Fix : Numbering on supplier invoice was not saved and on shipment displayed error when ok
2013-07-30 09:21:45 +02:00
Laurent Destailleur
87713c49ac
New: Into POST forms, if you can add a parameter DOL_AUTOSET_COOKIE with
...
a vlue that is list name, separated by a coma, of other POST parameters,
Dolibarr will automatically save this parameters into user cookies.
New: Can select to see number or amount or both, for graph boxes.
2013-07-29 19:12:04 +02:00
Cédric Salvador
bd9c4556e8
Preselected supplier when there's only one
2013-07-29 12:31:13 +02:00
Cédric Salvador
9dfa5c4218
selects
2013-07-29 12:31:09 +02:00
Cédric Salvador
8666725c62
Preselected supplier when there's only one
2013-07-29 12:31:08 +02:00
Cédric Salvador
0e77b273df
copyright
2013-07-29 12:31:06 +02:00
Cédric Salvador
da5bbd0a08
moved page + added link in the left menu
2013-07-29 12:31:06 +02:00
Florian Henry
d6f31d61bf
Fix Typhon model $mysoc global is missing
2013-07-29 12:21:52 +02:00
Laurent Destailleur
ad6bd5047f
Add error log to warn when module does not match specifications.
2013-07-28 14:42:50 +02:00
Laurent Destailleur
0743521b6b
- No need to load css of plugin fileupload (plugin never loaded). Too
...
much bugged to be included by default.
- Vertical menu must be under horizontal menu, even if horizontal menu
is wrapped.
- Add an empty li at end of list to provide more options for skins.
2013-07-28 05:35:51 +02:00
Laurent Destailleur
843478317e
Qual: Reduce CSS size by mutualizings styles.
2013-07-27 18:21:35 +02:00
Laurent Destailleur
444a3328c6
New: More options to select status of users into select user list.
2013-07-27 14:45:55 +02:00
Laurent Destailleur
67820774bb
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
ChangeLog
htdocs/commande/fiche.php
htdocs/core/class/extrafields.class.php
htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
2013-07-27 14:21:47 +02:00
Laurent Destailleur
14dfbfc40c
Fix: W3C (form into tr make some browsers crazy)
2013-07-27 13:29:06 +02:00
Laurent Destailleur
14dc6b0025
Merge pull request #1070 from jfefe/extra-listlabel
...
Can choose several fields to display with extrafield list of table
2013-07-27 03:24:34 -07:00
Laurent Destailleur
385d3612c5
Merge pull request #1136 from jfefe/extrarequired
...
Missing checks on extrafields
2013-07-27 03:09:44 -07:00
Laurent Destailleur
2f25e07e5a
Add class for body into login page
2013-07-27 11:53:15 +02:00
Laurent Destailleur
5ea500383c
Merge pull request #1102 from PaulPoulain/978-develop
...
[BUGFIX] T978 Delete users who are disabled
2013-07-27 02:50:11 -07:00
jfefe
90e245ca5a
Merge branch 'extra-listlabel' of github.com:jfefe/dolibarr into extra-listlabel
...
Conflicts:
htdocs/core/class/extrafields.class.php
2013-07-27 01:29:05 +02:00
jfefe
95e2f30f6b
Can choose several fields to display with extrafield list of table
2013-07-27 01:21:19 +02:00
Laurent Destailleur
99e5bf3120
New: Enhance graphical boxes. Prepare to show filters form to modify
...
graph.
2013-07-26 18:40:43 +02:00
jfefe
473541f19d
Fix : bad test field when checking extrafield is required
2013-07-26 15:41:17 +02:00
Laurent Destailleur
d0af692ed5
Fix: date must be reported according to user timezone
...
Conflicts:
htdocs/core/class/html.formfile.class.php
2013-07-26 15:23:41 +02:00
Laurent Destailleur
f2f8d60f19
Fix: date must be reported according to user timezone
2013-07-26 15:21:32 +02:00
Laurent Destailleur
5608e320f7
New: Can add a suffix into filename of template after -. This may be
...
used in future as specific criteria to filter list of numbering models
to show.
2013-07-26 15:10:56 +02:00
Laurent Destailleur
8e3d86c7a5
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/core/modules/propale/doc/pdf_azur.modules.php
2013-07-26 14:59:18 +02:00
Laurent Destailleur
e5de4c10ad
Fix: date must be reported according to user timezone
2013-07-26 14:49:46 +02:00
jfefe
c431fc716f
Check if an required extrafield is filled.
...
Method setOptionalsFromPost now return -1 if required field is blank
2013-07-26 13:18:23 +02:00
simnandez
7efacecb08
New: [ task #1005 ] Adapting to Spanish legislation bill numbering
2013-07-26 12:46:34 +02:00
Maxime Kohlhaas
1199e61f4b
CRLF issue
2013-07-26 12:33:58 +02:00
Laurent Destailleur
1e96452c6c
New: Can show images of product onto proposals.
2013-07-26 12:24:30 +02:00
Laurent Destailleur
c4d3307bfa
Qual: Normalize file name.
2013-07-26 11:36:36 +02:00
Laurent Destailleur
61f11d3621
Fix: Duplicate tooltip
2013-07-26 11:12:29 +02:00
jfefe
95bc40d0df
Missing attribute to indicate required fields
2013-07-26 08:51:22 +02:00
Laurent Destailleur
3ecb9c2dd8
Merge pull request #1130 from FHenry/3.4
...
Avoid php warning if extrafield "list from table" have bad settings
2013-07-25 13:40:09 -07:00
Laurent Destailleur
fe079f71da
Merge remote-tracking branch 'origin/3.3' into 3.4
2013-07-25 21:53:38 +02:00
Florian Henry
2f112efad5
Avoid php warning if extrafield list from table have bad settings
2013-07-25 20:18:45 +02:00
Laurent Destailleur
16d530b22d
Fix: Watermark make pagebreak crazy.
2013-07-25 18:58:47 +02:00
Laurent Destailleur
58da76292f
Fix: Watermark make pagebreak crazy.
2013-07-25 18:56:09 +02:00
Laurent Destailleur
339118d6f4
Prepare for option MAIN_GENERATE_PROPOSALS_WITH_PICTURE
...
Conflicts:
htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
htdocs/core/modules/propale/doc/pdf_azur.modules.php
htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
Conflicts:
htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
2013-07-24 20:20:31 +02:00
Laurent Destailleur
6b1b6b4fee
Fix: Color no more lost
2013-07-24 20:20:10 +02:00
Laurent Destailleur
44682bd932
Merge pull request #1128 from defrance69/patch-9
...
Update pdf_blochet.class.php
2013-07-24 07:07:41 -07:00
Laurent Destailleur
2266b8b2a4
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/adherents/class/adherent.class.php
htdocs/core/modules/expedition/doc/pdf_expedition_rouget.modules.php
htdocs/langs/ar_SA/bookmarks.lang
htdocs/langs/ar_SA/boxes.lang
htdocs/langs/ar_SA/cashdesk.lang
htdocs/langs/ar_SA/categories.lang
htdocs/langs/ar_SA/commercial.lang
htdocs/langs/ar_SA/companies.lang
htdocs/langs/ar_SA/compta.lang
htdocs/langs/ar_SA/contracts.lang
htdocs/langs/ar_SA/deliveries.lang
htdocs/langs/ar_SA/dict.lang
htdocs/langs/ar_SA/donations.lang
htdocs/langs/ar_SA/ecm.lang
htdocs/langs/ar_SA/errors.lang
htdocs/langs/ar_SA/exports.lang
htdocs/langs/ar_SA/externalsite.lang
htdocs/langs/ar_SA/ftp.lang
htdocs/langs/ar_SA/help.lang
htdocs/langs/ar_SA/install.lang
htdocs/langs/ar_SA/interventions.lang
htdocs/langs/ar_SA/languages.lang
htdocs/langs/ar_SA/ldap.lang
htdocs/langs/ar_SA/mails.lang
htdocs/langs/ar_SA/main.lang
htdocs/langs/ar_SA/members.lang
htdocs/langs/ar_SA/orders.lang
htdocs/langs/ar_SA/oscommerce.lang
htdocs/langs/ar_SA/paybox.lang
htdocs/langs/ar_SA/paypal.lang
htdocs/langs/ar_SA/projects.lang
htdocs/langs/ar_SA/propal.lang
htdocs/langs/ar_SA/sendings.lang
htdocs/langs/ar_SA/shop.lang
htdocs/langs/ar_SA/sms.lang
htdocs/langs/ar_SA/stocks.lang
htdocs/langs/ar_SA/suppliers.lang
htdocs/langs/ar_SA/trips.lang
htdocs/langs/ar_SA/users.lang
htdocs/langs/ar_SA/withdrawals.lang
htdocs/langs/ar_SA/workflow.lang
htdocs/langs/bg_BG/admin.lang
htdocs/langs/bg_BG/agenda.lang
htdocs/langs/bg_BG/banks.lang
htdocs/langs/bg_BG/bills.lang
htdocs/langs/bg_BG/bookmarks.lang
htdocs/langs/bg_BG/boxes.lang
htdocs/langs/bg_BG/cashdesk.lang
htdocs/langs/bg_BG/categories.lang
htdocs/langs/bg_BG/commercial.lang
htdocs/langs/bg_BG/companies.lang
htdocs/langs/bg_BG/compta.lang
htdocs/langs/bg_BG/contracts.lang
htdocs/langs/bg_BG/deliveries.lang
htdocs/langs/bg_BG/dict.lang
htdocs/langs/bg_BG/donations.lang
htdocs/langs/bg_BG/ecm.lang
htdocs/langs/bg_BG/errors.lang
htdocs/langs/bg_BG/exports.lang
htdocs/langs/bg_BG/externalsite.lang
htdocs/langs/bg_BG/ftp.lang
htdocs/langs/bg_BG/help.lang
htdocs/langs/bg_BG/holiday.lang
htdocs/langs/bg_BG/install.lang
htdocs/langs/bg_BG/interventions.lang
htdocs/langs/bg_BG/languages.lang
htdocs/langs/bg_BG/ldap.lang
htdocs/langs/bg_BG/mailmanspip.lang
htdocs/langs/bg_BG/mails.lang
htdocs/langs/bg_BG/main.lang
htdocs/langs/bg_BG/members.lang
htdocs/langs/bg_BG/orders.lang
htdocs/langs/bg_BG/oscommerce.lang
htdocs/langs/bg_BG/other.lang
htdocs/langs/bg_BG/paybox.lang
htdocs/langs/bg_BG/paypal.lang
htdocs/langs/bg_BG/products.lang
htdocs/langs/bg_BG/projects.lang
htdocs/langs/bg_BG/propal.lang
htdocs/langs/bg_BG/sendings.lang
htdocs/langs/bg_BG/shop.lang
htdocs/langs/bg_BG/sms.lang
htdocs/langs/bg_BG/stocks.lang
htdocs/langs/bg_BG/suppliers.lang
htdocs/langs/bg_BG/trips.lang
htdocs/langs/bg_BG/users.lang
htdocs/langs/bg_BG/withdrawals.lang
htdocs/langs/bg_BG/workflow.lang
htdocs/langs/ca_ES/paybox.lang
htdocs/langs/da_DK/agenda.lang
htdocs/langs/da_DK/banks.lang
htdocs/langs/da_DK/bookmarks.lang
htdocs/langs/da_DK/boxes.lang
htdocs/langs/da_DK/cashdesk.lang
htdocs/langs/da_DK/categories.lang
htdocs/langs/da_DK/commercial.lang
htdocs/langs/da_DK/companies.lang
htdocs/langs/da_DK/compta.lang
htdocs/langs/da_DK/contracts.lang
htdocs/langs/da_DK/deliveries.lang
htdocs/langs/da_DK/dict.lang
htdocs/langs/da_DK/donations.lang
htdocs/langs/da_DK/errors.lang
htdocs/langs/da_DK/exports.lang
htdocs/langs/da_DK/externalsite.lang
htdocs/langs/da_DK/ftp.lang
htdocs/langs/da_DK/install.lang
htdocs/langs/da_DK/interventions.lang
htdocs/langs/da_DK/languages.lang
htdocs/langs/da_DK/mails.lang
htdocs/langs/da_DK/members.lang
htdocs/langs/da_DK/orders.lang
htdocs/langs/da_DK/oscommerce.lang
htdocs/langs/da_DK/paybox.lang
htdocs/langs/da_DK/paypal.lang
htdocs/langs/da_DK/projects.lang
htdocs/langs/da_DK/propal.lang
htdocs/langs/da_DK/sendings.lang
htdocs/langs/da_DK/shop.lang
htdocs/langs/da_DK/sms.lang
htdocs/langs/da_DK/stocks.lang
htdocs/langs/da_DK/suppliers.lang
htdocs/langs/da_DK/trips.lang
htdocs/langs/da_DK/users.lang
htdocs/langs/da_DK/withdrawals.lang
htdocs/langs/da_DK/workflow.lang
htdocs/langs/de_DE/admin.lang
htdocs/langs/de_DE/agenda.lang
htdocs/langs/de_DE/banks.lang
htdocs/langs/de_DE/bills.lang
htdocs/langs/de_DE/bookmarks.lang
htdocs/langs/de_DE/boxes.lang
htdocs/langs/de_DE/cashdesk.lang
htdocs/langs/de_DE/categories.lang
htdocs/langs/de_DE/commercial.lang
htdocs/langs/de_DE/companies.lang
htdocs/langs/de_DE/compta.lang
htdocs/langs/de_DE/contracts.lang
htdocs/langs/de_DE/deliveries.lang
htdocs/langs/de_DE/dict.lang
htdocs/langs/de_DE/donations.lang
htdocs/langs/de_DE/ecm.lang
htdocs/langs/de_DE/errors.lang
htdocs/langs/de_DE/exports.lang
htdocs/langs/de_DE/externalsite.lang
htdocs/langs/de_DE/ftp.lang
htdocs/langs/de_DE/help.lang
htdocs/langs/de_DE/install.lang
htdocs/langs/de_DE/interventions.lang
htdocs/langs/de_DE/languages.lang
htdocs/langs/de_DE/ldap.lang
htdocs/langs/de_DE/mails.lang
htdocs/langs/de_DE/main.lang
htdocs/langs/de_DE/members.lang
htdocs/langs/de_DE/orders.lang
htdocs/langs/de_DE/oscommerce.lang
htdocs/langs/de_DE/other.lang
htdocs/langs/de_DE/paybox.lang
htdocs/langs/de_DE/paypal.lang
htdocs/langs/de_DE/products.lang
htdocs/langs/de_DE/projects.lang
htdocs/langs/de_DE/propal.lang
htdocs/langs/de_DE/sendings.lang
htdocs/langs/de_DE/shop.lang
htdocs/langs/de_DE/sms.lang
htdocs/langs/de_DE/stocks.lang
htdocs/langs/de_DE/suppliers.lang
htdocs/langs/de_DE/trips.lang
htdocs/langs/de_DE/users.lang
htdocs/langs/de_DE/withdrawals.lang
htdocs/langs/de_DE/workflow.lang
htdocs/langs/el_GR/agenda.lang
htdocs/langs/el_GR/banks.lang
htdocs/langs/el_GR/bookmarks.lang
htdocs/langs/el_GR/boxes.lang
htdocs/langs/el_GR/cashdesk.lang
htdocs/langs/el_GR/commercial.lang
htdocs/langs/el_GR/companies.lang
htdocs/langs/el_GR/compta.lang
htdocs/langs/el_GR/contracts.lang
htdocs/langs/el_GR/deliveries.lang
htdocs/langs/el_GR/dict.lang
htdocs/langs/el_GR/donations.lang
htdocs/langs/el_GR/errors.lang
htdocs/langs/el_GR/externalsite.lang
htdocs/langs/el_GR/ftp.lang
htdocs/langs/el_GR/help.lang
htdocs/langs/el_GR/install.lang
htdocs/langs/el_GR/interventions.lang
htdocs/langs/el_GR/languages.lang
htdocs/langs/el_GR/ldap.lang
htdocs/langs/el_GR/mails.lang
htdocs/langs/el_GR/main.lang
htdocs/langs/el_GR/orders.lang
htdocs/langs/el_GR/paybox.lang
htdocs/langs/el_GR/paypal.lang
htdocs/langs/el_GR/projects.lang
htdocs/langs/el_GR/propal.lang
htdocs/langs/el_GR/sendings.lang
htdocs/langs/el_GR/shop.lang
htdocs/langs/el_GR/sms.lang
htdocs/langs/el_GR/stocks.lang
htdocs/langs/el_GR/suppliers.lang
htdocs/langs/el_GR/trips.lang
htdocs/langs/el_GR/users.lang
htdocs/langs/el_GR/withdrawals.lang
htdocs/langs/el_GR/workflow.lang
htdocs/langs/en_US/bookmarks.lang
htdocs/langs/en_US/ftp.lang
htdocs/langs/en_US/other.lang
htdocs/langs/en_US/paypal.lang
htdocs/langs/et_EE/admin.lang
htdocs/langs/et_EE/agenda.lang
htdocs/langs/et_EE/banks.lang
htdocs/langs/et_EE/bills.lang
htdocs/langs/et_EE/bookmarks.lang
htdocs/langs/et_EE/boxes.lang
htdocs/langs/et_EE/cashdesk.lang
htdocs/langs/et_EE/categories.lang
htdocs/langs/et_EE/commercial.lang
htdocs/langs/et_EE/companies.lang
htdocs/langs/et_EE/compta.lang
htdocs/langs/et_EE/contracts.lang
htdocs/langs/et_EE/deliveries.lang
htdocs/langs/et_EE/dict.lang
htdocs/langs/et_EE/donations.lang
htdocs/langs/et_EE/ecm.lang
htdocs/langs/et_EE/errors.lang
htdocs/langs/et_EE/exports.lang
htdocs/langs/et_EE/externalsite.lang
htdocs/langs/et_EE/ftp.lang
htdocs/langs/et_EE/help.lang
htdocs/langs/et_EE/install.lang
htdocs/langs/et_EE/interventions.lang
htdocs/langs/et_EE/languages.lang
htdocs/langs/et_EE/ldap.lang
htdocs/langs/et_EE/mails.lang
htdocs/langs/et_EE/main.lang
htdocs/langs/et_EE/members.lang
htdocs/langs/et_EE/orders.lang
htdocs/langs/et_EE/oscommerce.lang
htdocs/langs/et_EE/other.lang
htdocs/langs/et_EE/paybox.lang
htdocs/langs/et_EE/paypal.lang
htdocs/langs/et_EE/products.lang
htdocs/langs/et_EE/projects.lang
htdocs/langs/et_EE/propal.lang
htdocs/langs/et_EE/sendings.lang
htdocs/langs/et_EE/shop.lang
htdocs/langs/et_EE/sms.lang
htdocs/langs/et_EE/stocks.lang
htdocs/langs/et_EE/suppliers.lang
htdocs/langs/et_EE/trips.lang
htdocs/langs/et_EE/users.lang
htdocs/langs/et_EE/withdrawals.lang
htdocs/langs/et_EE/workflow.lang
htdocs/langs/fa_IR/agenda.lang
htdocs/langs/fa_IR/banks.lang
htdocs/langs/fa_IR/bookmarks.lang
htdocs/langs/fa_IR/boxes.lang
htdocs/langs/fa_IR/categories.lang
htdocs/langs/fa_IR/commercial.lang
htdocs/langs/fa_IR/companies.lang
htdocs/langs/fa_IR/compta.lang
htdocs/langs/fa_IR/contracts.lang
htdocs/langs/fa_IR/deliveries.lang
htdocs/langs/fa_IR/dict.lang
htdocs/langs/fa_IR/donations.lang
htdocs/langs/fa_IR/ecm.lang
htdocs/langs/fa_IR/errors.lang
htdocs/langs/fa_IR/exports.lang
htdocs/langs/fa_IR/ftp.lang
htdocs/langs/fa_IR/help.lang
htdocs/langs/fa_IR/install.lang
htdocs/langs/fa_IR/interventions.lang
htdocs/langs/fa_IR/languages.lang
htdocs/langs/fa_IR/ldap.lang
htdocs/langs/fa_IR/mails.lang
htdocs/langs/fa_IR/main.lang
htdocs/langs/fa_IR/members.lang
htdocs/langs/fa_IR/orders.lang
htdocs/langs/fa_IR/oscommerce.lang
htdocs/langs/fa_IR/paybox.lang
htdocs/langs/fa_IR/paypal.lang
htdocs/langs/fa_IR/projects.lang
htdocs/langs/fa_IR/propal.lang
htdocs/langs/fa_IR/shop.lang
htdocs/langs/fa_IR/stocks.lang
htdocs/langs/fa_IR/suppliers.lang
htdocs/langs/fa_IR/trips.lang
htdocs/langs/fa_IR/users.lang
htdocs/langs/fa_IR/withdrawals.lang
htdocs/langs/fi_FI/agenda.lang
htdocs/langs/fi_FI/banks.lang
htdocs/langs/fi_FI/bookmarks.lang
htdocs/langs/fi_FI/boxes.lang
htdocs/langs/fi_FI/cashdesk.lang
htdocs/langs/fi_FI/categories.lang
htdocs/langs/fi_FI/commercial.lang
htdocs/langs/fi_FI/companies.lang
htdocs/langs/fi_FI/compta.lang
htdocs/langs/fi_FI/contracts.lang
htdocs/langs/fi_FI/deliveries.lang
htdocs/langs/fi_FI/dict.lang
htdocs/langs/fi_FI/donations.lang
htdocs/langs/fi_FI/errors.lang
htdocs/langs/fi_FI/exports.lang
htdocs/langs/fi_FI/externalsite.lang
htdocs/langs/fi_FI/ftp.lang
htdocs/langs/fi_FI/install.lang
htdocs/langs/fi_FI/interventions.lang
htdocs/langs/fi_FI/languages.lang
htdocs/langs/fi_FI/mails.lang
htdocs/langs/fi_FI/members.lang
htdocs/langs/fi_FI/orders.lang
htdocs/langs/fi_FI/paybox.lang
htdocs/langs/fi_FI/paypal.lang
htdocs/langs/fi_FI/projects.lang
htdocs/langs/fi_FI/propal.lang
htdocs/langs/fi_FI/sendings.lang
htdocs/langs/fi_FI/sms.lang
htdocs/langs/fi_FI/stocks.lang
htdocs/langs/fi_FI/suppliers.lang
htdocs/langs/fi_FI/trips.lang
htdocs/langs/fi_FI/users.lang
htdocs/langs/fi_FI/withdrawals.lang
htdocs/langs/fi_FI/workflow.lang
htdocs/langs/fr_FR/bookmarks.lang
htdocs/langs/fr_FR/externalsite.lang
htdocs/langs/fr_FR/other.lang
htdocs/langs/fr_FR/paybox.lang
htdocs/langs/fr_FR/paypal.lang
htdocs/langs/he_IL/workflow.lang
htdocs/langs/hu_HU/admin.lang
htdocs/langs/hu_HU/agenda.lang
htdocs/langs/hu_HU/banks.lang
htdocs/langs/hu_HU/bills.lang
htdocs/langs/hu_HU/boxes.lang
htdocs/langs/hu_HU/cashdesk.lang
htdocs/langs/hu_HU/commercial.lang
htdocs/langs/hu_HU/companies.lang
htdocs/langs/hu_HU/compta.lang
htdocs/langs/hu_HU/contracts.lang
htdocs/langs/hu_HU/deliveries.lang
htdocs/langs/hu_HU/dict.lang
htdocs/langs/hu_HU/donations.lang
htdocs/langs/hu_HU/errors.lang
htdocs/langs/hu_HU/exports.lang
htdocs/langs/hu_HU/externalsite.lang
htdocs/langs/hu_HU/install.lang
htdocs/langs/hu_HU/interventions.lang
htdocs/langs/hu_HU/languages.lang
htdocs/langs/hu_HU/mails.lang
htdocs/langs/hu_HU/main.lang
htdocs/langs/hu_HU/members.lang
htdocs/langs/hu_HU/orders.lang
htdocs/langs/hu_HU/oscommerce.lang
htdocs/langs/hu_HU/other.lang
htdocs/langs/hu_HU/paybox.lang
htdocs/langs/hu_HU/paypal.lang
htdocs/langs/hu_HU/projects.lang
htdocs/langs/hu_HU/propal.lang
htdocs/langs/hu_HU/sendings.lang
htdocs/langs/hu_HU/sms.lang
htdocs/langs/hu_HU/stocks.lang
htdocs/langs/hu_HU/suppliers.lang
htdocs/langs/hu_HU/trips.lang
htdocs/langs/hu_HU/users.lang
htdocs/langs/hu_HU/withdrawals.lang
htdocs/langs/hu_HU/workflow.lang
htdocs/langs/is_IS/agenda.lang
htdocs/langs/is_IS/banks.lang
htdocs/langs/is_IS/bookmarks.lang
htdocs/langs/is_IS/boxes.lang
htdocs/langs/is_IS/cashdesk.lang
htdocs/langs/is_IS/categories.lang
htdocs/langs/is_IS/commercial.lang
htdocs/langs/is_IS/companies.lang
htdocs/langs/is_IS/compta.lang
htdocs/langs/is_IS/contracts.lang
htdocs/langs/is_IS/deliveries.lang
htdocs/langs/is_IS/dict.lang
htdocs/langs/is_IS/donations.lang
htdocs/langs/is_IS/ecm.lang
htdocs/langs/is_IS/errors.lang
htdocs/langs/is_IS/exports.lang
htdocs/langs/is_IS/externalsite.lang
htdocs/langs/is_IS/ftp.lang
htdocs/langs/is_IS/help.lang
htdocs/langs/is_IS/install.lang
htdocs/langs/is_IS/interventions.lang
htdocs/langs/is_IS/languages.lang
htdocs/langs/is_IS/ldap.lang
htdocs/langs/is_IS/mails.lang
htdocs/langs/is_IS/main.lang
htdocs/langs/is_IS/members.lang
htdocs/langs/is_IS/orders.lang
htdocs/langs/is_IS/oscommerce.lang
htdocs/langs/is_IS/paybox.lang
htdocs/langs/is_IS/paypal.lang
htdocs/langs/is_IS/products.lang
htdocs/langs/is_IS/projects.lang
htdocs/langs/is_IS/propal.lang
htdocs/langs/is_IS/sendings.lang
htdocs/langs/is_IS/shop.lang
htdocs/langs/is_IS/sms.lang
htdocs/langs/is_IS/stocks.lang
htdocs/langs/is_IS/suppliers.lang
htdocs/langs/is_IS/trips.lang
htdocs/langs/is_IS/users.lang
htdocs/langs/is_IS/withdrawals.lang
htdocs/langs/is_IS/workflow.lang
htdocs/langs/it_IT/bookmarks.lang
htdocs/langs/it_IT/cashdesk.lang
htdocs/langs/it_IT/errors.lang
htdocs/langs/it_IT/exports.lang
htdocs/langs/it_IT/externalsite.lang
htdocs/langs/it_IT/languages.lang
htdocs/langs/it_IT/paybox.lang
htdocs/langs/it_IT/paypal.lang
htdocs/langs/it_IT/projects.lang
htdocs/langs/it_IT/propal.lang
htdocs/langs/it_IT/sendings.lang
htdocs/langs/it_IT/sms.lang
htdocs/langs/it_IT/workflow.lang
htdocs/langs/ja_JP/admin.lang
htdocs/langs/ja_JP/agenda.lang
htdocs/langs/ja_JP/banks.lang
htdocs/langs/ja_JP/bills.lang
htdocs/langs/ja_JP/bookmarks.lang
htdocs/langs/ja_JP/boxes.lang
htdocs/langs/ja_JP/cashdesk.lang
htdocs/langs/ja_JP/categories.lang
htdocs/langs/ja_JP/commercial.lang
htdocs/langs/ja_JP/companies.lang
htdocs/langs/ja_JP/compta.lang
htdocs/langs/ja_JP/contracts.lang
htdocs/langs/ja_JP/deliveries.lang
htdocs/langs/ja_JP/dict.lang
htdocs/langs/ja_JP/donations.lang
htdocs/langs/ja_JP/ecm.lang
htdocs/langs/ja_JP/errors.lang
htdocs/langs/ja_JP/exports.lang
htdocs/langs/ja_JP/externalsite.lang
htdocs/langs/ja_JP/ftp.lang
htdocs/langs/ja_JP/help.lang
htdocs/langs/ja_JP/install.lang
htdocs/langs/ja_JP/interventions.lang
htdocs/langs/ja_JP/languages.lang
htdocs/langs/ja_JP/ldap.lang
htdocs/langs/ja_JP/mails.lang
htdocs/langs/ja_JP/main.lang
htdocs/langs/ja_JP/members.lang
htdocs/langs/ja_JP/orders.lang
htdocs/langs/ja_JP/oscommerce.lang
htdocs/langs/ja_JP/other.lang
htdocs/langs/ja_JP/paybox.lang
htdocs/langs/ja_JP/paypal.lang
htdocs/langs/ja_JP/products.lang
htdocs/langs/ja_JP/projects.lang
htdocs/langs/ja_JP/propal.lang
htdocs/langs/ja_JP/sendings.lang
htdocs/langs/ja_JP/shop.lang
htdocs/langs/ja_JP/sms.lang
htdocs/langs/ja_JP/stocks.lang
htdocs/langs/ja_JP/suppliers.lang
htdocs/langs/ja_JP/trips.lang
htdocs/langs/ja_JP/users.lang
htdocs/langs/ja_JP/withdrawals.lang
htdocs/langs/ja_JP/workflow.lang
htdocs/langs/nb_NO/agenda.lang
htdocs/langs/nb_NO/banks.lang
htdocs/langs/nb_NO/bookmarks.lang
htdocs/langs/nb_NO/boxes.lang
htdocs/langs/nb_NO/cashdesk.lang
htdocs/langs/nb_NO/categories.lang
htdocs/langs/nb_NO/commercial.lang
htdocs/langs/nb_NO/companies.lang
htdocs/langs/nb_NO/compta.lang
htdocs/langs/nb_NO/contracts.lang
htdocs/langs/nb_NO/deliveries.lang
htdocs/langs/nb_NO/dict.lang
htdocs/langs/nb_NO/donations.lang
htdocs/langs/nb_NO/errors.lang
htdocs/langs/nb_NO/exports.lang
htdocs/langs/nb_NO/externalsite.lang
htdocs/langs/nb_NO/ftp.lang
htdocs/langs/nb_NO/help.lang
htdocs/langs/nb_NO/install.lang
htdocs/langs/nb_NO/interventions.lang
htdocs/langs/nb_NO/languages.lang
htdocs/langs/nb_NO/ldap.lang
htdocs/langs/nb_NO/mails.lang
htdocs/langs/nb_NO/main.lang
htdocs/langs/nb_NO/members.lang
htdocs/langs/nb_NO/orders.lang
htdocs/langs/nb_NO/paybox.lang
htdocs/langs/nb_NO/paypal.lang
htdocs/langs/nb_NO/projects.lang
htdocs/langs/nb_NO/propal.lang
htdocs/langs/nb_NO/sendings.lang
htdocs/langs/nb_NO/sms.lang
htdocs/langs/nb_NO/stocks.lang
htdocs/langs/nb_NO/suppliers.lang
htdocs/langs/nb_NO/trips.lang
htdocs/langs/nb_NO/users.lang
htdocs/langs/nb_NO/withdrawals.lang
htdocs/langs/nb_NO/workflow.lang
htdocs/langs/nl_NL/propal.lang
htdocs/langs/nl_NL/workflow.lang
htdocs/langs/pl_PL/agenda.lang
htdocs/langs/pl_PL/banks.lang
htdocs/langs/pl_PL/bookmarks.lang
htdocs/langs/pl_PL/boxes.lang
htdocs/langs/pl_PL/cashdesk.lang
htdocs/langs/pl_PL/categories.lang
htdocs/langs/pl_PL/commercial.lang
htdocs/langs/pl_PL/companies.lang
htdocs/langs/pl_PL/compta.lang
htdocs/langs/pl_PL/contracts.lang
htdocs/langs/pl_PL/deliveries.lang
htdocs/langs/pl_PL/dict.lang
htdocs/langs/pl_PL/donations.lang
htdocs/langs/pl_PL/errors.lang
htdocs/langs/pl_PL/exports.lang
htdocs/langs/pl_PL/externalsite.lang
htdocs/langs/pl_PL/ftp.lang
htdocs/langs/pl_PL/install.lang
htdocs/langs/pl_PL/interventions.lang
htdocs/langs/pl_PL/languages.lang
htdocs/langs/pl_PL/mails.lang
htdocs/langs/pl_PL/members.lang
htdocs/langs/pl_PL/orders.lang
htdocs/langs/pl_PL/other.lang
htdocs/langs/pl_PL/paybox.lang
htdocs/langs/pl_PL/paypal.lang
htdocs/langs/pl_PL/projects.lang
htdocs/langs/pl_PL/propal.lang
htdocs/langs/pl_PL/sendings.lang
htdocs/langs/pl_PL/sms.lang
htdocs/langs/pl_PL/stocks.lang
htdocs/langs/pl_PL/suppliers.lang
htdocs/langs/pl_PL/trips.lang
htdocs/langs/pl_PL/users.lang
htdocs/langs/pl_PL/withdrawals.lang
htdocs/langs/pl_PL/workflow.lang
htdocs/langs/pt_PT/cashdesk.lang
htdocs/langs/ro_RO/agenda.lang
htdocs/langs/ro_RO/banks.lang
htdocs/langs/ro_RO/bookmarks.lang
htdocs/langs/ro_RO/boxes.lang
htdocs/langs/ro_RO/cashdesk.lang
htdocs/langs/ro_RO/commercial.lang
htdocs/langs/ro_RO/companies.lang
htdocs/langs/ro_RO/compta.lang
htdocs/langs/ro_RO/contracts.lang
htdocs/langs/ro_RO/deliveries.lang
htdocs/langs/ro_RO/dict.lang
htdocs/langs/ro_RO/donations.lang
htdocs/langs/ro_RO/errors.lang
htdocs/langs/ro_RO/exports.lang
htdocs/langs/ro_RO/externalsite.lang
htdocs/langs/ro_RO/interventions.lang
htdocs/langs/ro_RO/languages.lang
htdocs/langs/ro_RO/mails.lang
htdocs/langs/ro_RO/main.lang
htdocs/langs/ro_RO/members.lang
htdocs/langs/ro_RO/orders.lang
htdocs/langs/ro_RO/other.lang
htdocs/langs/ro_RO/paybox.lang
htdocs/langs/ro_RO/paypal.lang
htdocs/langs/ro_RO/projects.lang
htdocs/langs/ro_RO/propal.lang
htdocs/langs/ro_RO/sendings.lang
htdocs/langs/ro_RO/sms.lang
htdocs/langs/ro_RO/stocks.lang
htdocs/langs/ro_RO/suppliers.lang
htdocs/langs/ro_RO/trips.lang
htdocs/langs/ro_RO/users.lang
htdocs/langs/ro_RO/withdrawals.lang
htdocs/langs/ro_RO/workflow.lang
htdocs/langs/ru_RU/agenda.lang
htdocs/langs/ru_RU/bills.lang
htdocs/langs/ru_RU/bookmarks.lang
htdocs/langs/ru_RU/boxes.lang
htdocs/langs/ru_RU/companies.lang
htdocs/langs/ru_RU/compta.lang
htdocs/langs/ru_RU/contracts.lang
htdocs/langs/ru_RU/errors.lang
htdocs/langs/ru_RU/exports.lang
htdocs/langs/ru_RU/externalsite.lang
htdocs/langs/ru_RU/install.lang
htdocs/langs/ru_RU/mails.lang
htdocs/langs/ru_RU/main.lang
htdocs/langs/ru_RU/members.lang
htdocs/langs/ru_RU/orders.lang
htdocs/langs/ru_RU/paybox.lang
htdocs/langs/ru_RU/paypal.lang
htdocs/langs/ru_RU/propal.lang
htdocs/langs/ru_RU/stocks.lang
htdocs/langs/ru_UA/main.lang
htdocs/langs/sl_SI/agenda.lang
htdocs/langs/sl_SI/boxes.lang
htdocs/langs/sl_SI/cashdesk.lang
htdocs/langs/sl_SI/companies.lang
htdocs/langs/sl_SI/compta.lang
htdocs/langs/sl_SI/contracts.lang
htdocs/langs/sl_SI/dict.lang
htdocs/langs/sl_SI/errors.lang
htdocs/langs/sl_SI/exports.lang
htdocs/langs/sl_SI/externalsite.lang
htdocs/langs/sl_SI/install.lang
htdocs/langs/sl_SI/languages.lang
htdocs/langs/sl_SI/mails.lang
htdocs/langs/sl_SI/main.lang
htdocs/langs/sl_SI/members.lang
htdocs/langs/sl_SI/orders.lang
htdocs/langs/sl_SI/paybox.lang
htdocs/langs/sl_SI/paypal.lang
htdocs/langs/sl_SI/propal.lang
htdocs/langs/sl_SI/sendings.lang
htdocs/langs/sl_SI/stocks.lang
htdocs/langs/sl_SI/suppliers.lang
htdocs/langs/sv_SE/admin.lang
htdocs/langs/sv_SE/agenda.lang
htdocs/langs/sv_SE/banks.lang
htdocs/langs/sv_SE/bookmarks.lang
htdocs/langs/sv_SE/boxes.lang
htdocs/langs/sv_SE/cashdesk.lang
htdocs/langs/sv_SE/categories.lang
htdocs/langs/sv_SE/commercial.lang
htdocs/langs/sv_SE/companies.lang
htdocs/langs/sv_SE/compta.lang
htdocs/langs/sv_SE/contracts.lang
htdocs/langs/sv_SE/deliveries.lang
htdocs/langs/sv_SE/dict.lang
htdocs/langs/sv_SE/donations.lang
htdocs/langs/sv_SE/ecm.lang
htdocs/langs/sv_SE/errors.lang
htdocs/langs/sv_SE/exports.lang
htdocs/langs/sv_SE/externalsite.lang
htdocs/langs/sv_SE/ftp.lang
htdocs/langs/sv_SE/help.lang
htdocs/langs/sv_SE/install.lang
htdocs/langs/sv_SE/interventions.lang
htdocs/langs/sv_SE/languages.lang
htdocs/langs/sv_SE/ldap.lang
htdocs/langs/sv_SE/mails.lang
htdocs/langs/sv_SE/main.lang
htdocs/langs/sv_SE/members.lang
htdocs/langs/sv_SE/orders.lang
htdocs/langs/sv_SE/oscommerce.lang
htdocs/langs/sv_SE/other.lang
htdocs/langs/sv_SE/paybox.lang
htdocs/langs/sv_SE/paypal.lang
htdocs/langs/sv_SE/products.lang
htdocs/langs/sv_SE/projects.lang
htdocs/langs/sv_SE/propal.lang
htdocs/langs/sv_SE/sendings.lang
htdocs/langs/sv_SE/shop.lang
htdocs/langs/sv_SE/sms.lang
htdocs/langs/sv_SE/stocks.lang
htdocs/langs/sv_SE/suppliers.lang
htdocs/langs/sv_SE/trips.lang
htdocs/langs/sv_SE/users.lang
htdocs/langs/sv_SE/withdrawals.lang
htdocs/langs/sv_SE/workflow.lang
htdocs/langs/tr_TR/donations.lang
htdocs/langs/tr_TR/ldap.lang
htdocs/langs/tr_TR/oscommerce.lang
htdocs/langs/tr_TR/paybox.lang
htdocs/langs/tr_TR/paypal.lang
htdocs/langs/tr_TR/shop.lang
htdocs/langs/tr_TR/trips.lang
htdocs/langs/zh_CN/agenda.lang
htdocs/langs/zh_CN/banks.lang
htdocs/langs/zh_CN/bookmarks.lang
htdocs/langs/zh_CN/boxes.lang
htdocs/langs/zh_CN/cashdesk.lang
htdocs/langs/zh_CN/commercial.lang
htdocs/langs/zh_CN/companies.lang
htdocs/langs/zh_CN/compta.lang
htdocs/langs/zh_CN/contracts.lang
htdocs/langs/zh_CN/deliveries.lang
htdocs/langs/zh_CN/dict.lang
htdocs/langs/zh_CN/donations.lang
htdocs/langs/zh_CN/ecm.lang
htdocs/langs/zh_CN/errors.lang
htdocs/langs/zh_CN/exports.lang
htdocs/langs/zh_CN/externalsite.lang
htdocs/langs/zh_CN/ftp.lang
htdocs/langs/zh_CN/install.lang
htdocs/langs/zh_CN/interventions.lang
htdocs/langs/zh_CN/languages.lang
htdocs/langs/zh_CN/mails.lang
htdocs/langs/zh_CN/main.lang
htdocs/langs/zh_CN/members.lang
htdocs/langs/zh_CN/orders.lang
htdocs/langs/zh_CN/oscommerce.lang
htdocs/langs/zh_CN/paybox.lang
htdocs/langs/zh_CN/paypal.lang
htdocs/langs/zh_CN/projects.lang
htdocs/langs/zh_CN/propal.lang
htdocs/langs/zh_CN/sendings.lang
htdocs/langs/zh_CN/shop.lang
htdocs/langs/zh_CN/sms.lang
htdocs/langs/zh_CN/stocks.lang
htdocs/langs/zh_CN/suppliers.lang
htdocs/langs/zh_CN/trips.lang
htdocs/langs/zh_CN/users.lang
htdocs/langs/zh_CN/withdrawals.lang
htdocs/langs/zh_CN/workflow.lang
htdocs/langs/zh_TW/banks.lang
htdocs/langs/zh_TW/bookmarks.lang
htdocs/langs/zh_TW/boxes.lang
htdocs/langs/zh_TW/cashdesk.lang
htdocs/langs/zh_TW/deliveries.lang
htdocs/langs/zh_TW/ecm.lang
htdocs/langs/zh_TW/externalsite.lang
htdocs/langs/zh_TW/oscommerce.lang
htdocs/langs/zh_TW/paypal.lang
htdocs/langs/zh_TW/shop.lang
htdocs/langs/zh_TW/sms.lang
htdocs/langs/zh_TW/trips.lang
htdocs/langs/zh_TW/withdrawals.lang
htdocs/langs/zh_TW/workflow.lang
scripts/invoices/email_unpaid_invoices_to_customers.php
scripts/members/sync_members_ldap2dolibarr.php
2013-07-24 15:51:50 +02:00
Laurent Destailleur
bf9b255c92
Merge remote-tracking branch 'origin/3.3' into 3.4
...
Conflicts:
build/rpm/dolibarr_fedora.spec
build/rpm/dolibarr_opensuse.spec
2013-07-24 15:25:00 +02:00
Florian Henry
0ce833d282
Fix bug export contact extrafields
2013-07-24 15:19:05 +02:00
Juanjo Menent
9babb6cc4a
Merge pull request #1129 from FHenry/3.4
...
Fix bug export contact extrafields
2013-07-24 06:18:00 -07:00
Laurent Destailleur
7cf429d238
Fix: Color change on page break.
2013-07-24 15:04:09 +02:00
Laurent Destailleur
cc83ad0b0e
Merge remote-tracking branch 'origin/3.4' into develop
2013-07-24 14:15:35 +02:00
Florian Henry
f11d477770
Fix bug export contact extrafields
2013-07-24 13:28:02 +02:00
Laurent Destailleur
2f2f2b66c4
Fix: creation of thumbs not working
2013-07-24 11:26:09 +02:00
BENKE Charles
34c09c3aa5
Update pdf_blochet.class.php
...
add ref_ext on pdf output if not empty
2013-07-24 11:14:38 +02:00
Laurent Destailleur
126c72ca24
Merge pull request #1127 from csalvador/taskpdffix
...
fix pdf model import
2013-07-24 01:30:55 -07:00
Laurent Destailleur
644f5149e4
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/core/class/html.formfile.class.php
2013-07-24 00:42:28 +02:00
Laurent Destailleur
30cd4aeced
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-07-23 18:37:09 +02:00
Laurent Destailleur
71634a0c76
Fix: Add missing css style
2013-07-23 18:36:18 +02:00
Laurent Destailleur
91debb5b82
Merge pull request #1125 from csalvador/formfile
...
added permission to the hook parameters to make it easier to check
2013-07-23 09:32:12 -07:00
Laurent Destailleur
df27538d74
Merge pull request #1122 from FHenry/3.4
...
Avoid PHP warning
2013-07-23 09:31:16 -07:00
Laurent Destailleur
1d81d1f42c
Merge pull request #1120 from defrance69/patch-7
...
Update modBanque.class.php
2013-07-23 09:30:53 -07:00
Laurent Destailleur
1596619f2d
Merge pull request #1118 from csalvador/bugfix
...
instanciation of Facture objects raised errors, deleted them
2013-07-23 09:27:56 -07:00
Laurent Destailleur
ac2ba9d1f6
Merge pull request #1117 from atm-maxime/mko149
...
Task 149 : # of files and notes appears in tab
2013-07-23 09:26:59 -07:00
Cédric Salvador
35faff04e9
fix pdf model import
2013-07-23 15:59:41 +02:00
Florian Henry
6f262b3a5b
Avoid PHP warning
2013-07-23 15:52:41 +02:00
Laurent Destailleur
cbeeb463e2
Fix: Missing tr line
2013-07-23 15:26:35 +02:00
Laurent Destailleur
361f3a638a
Fix: W3C
2013-07-23 15:24:34 +02:00
Cédric Salvador
7bd7c5206d
added permission to the hook parameters to make it easier to check
2013-07-23 11:05:46 +02:00
BENKE Charles
8c7c3f03d3
Update modBanque.class.php
...
Add bordereau ref_ext fields on export
2013-07-23 05:54:47 +02:00
Cédric Salvador
19dc3ef8da
instanciation of Facture objects raised errors, deleted them
2013-07-22 11:51:29 +02:00
Juanjo Menent
e939a4d268
Merge pull request #1116 from FHenry/develop
...
Add category contact into left menu entry
2013-07-22 02:17:52 -07:00
lalaina rasamoelina
4ecc9b30a9
Delete the name of user who are disable in the creation of events
2013-07-22 11:17:45 +02:00
Florian Henry
26894d9749
Fix bug in SQL
2013-07-22 10:17:31 +02:00
Florian Henry
bbacef6815
Add category contact into left menu entry for augeria theme
2013-07-22 10:15:48 +02:00
Juanjo Menent
d7da816258
Merge pull request #1114 from defrance69/patch-5
...
Update modBanque.class.php
2013-07-22 00:05:46 -07:00
Florian Henry
1a8377d847
Add category contact into left menu entry
2013-07-21 10:47:55 +02:00
BENKE Charles
c555c17315
Update modBanque.class.php
...
Add Export of check deposit / bill
2013-07-20 23:47:37 +02:00
Maxime Kohlhaas
da3e711be7
Task 149 : fix dir on company + added # of notes and documents on supplier order, invoice and project
2013-07-20 10:54:38 +02:00
Maxime Kohlhaas
28eb9d07b2
Task 149 : add # of notes and doc in tab + have always last 3 tabs be notes, doc and info
2013-07-20 09:07:10 +02:00
Geoffrey
27e26c872e
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
...
Conflicts:
ChangeLog
2013-07-19 17:33:29 +02:00
Maxime Kohlhaas
7c24686532
Add good vars for odt generation
2013-07-19 17:27:22 +02:00
Laurent Destailleur
486920958c
Fix: Restore error message, but only when required.
2013-07-19 17:19:35 +02:00
Laurent Destailleur
c7aadfcf65
Fix: syntax error
2013-07-19 17:18:44 +02:00
Laurent Destailleur
7aa5daaeaf
Merge pull request #1110 from GPCsolutions/noerrorsondocuments
...
Avoid printing errors on documents that are fine without
2013-07-19 07:41:51 -07:00
Laurent Destailleur
91b51f1f58
Fix: Some td cells must not have hover styles.
2013-07-19 15:52:49 +02:00
Laurent Destailleur
ed52dd9636
New: A more responsive desgin for statistic box of home page
...
Qual: Hook for statistics now match specifications.
2013-07-19 15:29:40 +02:00
Raphaël Doursenaud
e119a5c650
Avoid printing errors on documents that are fine without
2013-07-19 15:08:30 +02:00
Laurent Destailleur
d802470aae
I killed <td nowrap>. Hello <td class="nowrap"> !
2013-07-19 14:23:42 +02:00
Laurent Destailleur
3896cde299
Removed useless method. Prefer using generic method.
2013-07-19 13:38:57 +02:00
Laurent Destailleur
4d2c80a122
Merge pull request #1107 from atm-maxime/develop
...
Add possibility to define dependencies between extra fields lists
2013-07-19 04:16:27 -07:00
Laurent Destailleur
e06752bc0e
Merge pull request #1105 from atm-maxime/mko149
...
Task 149 : # of files and notes appears in tab
2013-07-19 04:14:05 -07:00
Maxime Kohlhaas
efff92fe1c
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
2013-07-19 09:19:34 +02:00
Maxime Kohlhaas
01e4d905fb
Start work on bank sharing for multi-company
2013-07-19 09:19:20 +02:00
Laurent Destailleur
c943ef8edb
Fix: doxygen
2013-07-18 23:39:29 +02:00
Laurent Destailleur
22f57e3350
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-07-18 19:02:02 +02:00
Laurent Destailleur
a240dba290
Fix: Translation of text
2013-07-18 19:01:19 +02:00
Maxime Kohlhaas
aff2be1bc0
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
2013-07-18 17:50:51 +02:00
Maxime Kohlhaas
63e6cf5c81
Add possibility to define dependencies between extra lists
2013-07-18 17:42:09 +02:00
Laurent Destailleur
75214a6b70
New: Add graphical box for turnover and proposal
2013-07-18 16:53:31 +02:00
Maxime Kohlhaas
e0d037dae5
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko149
2013-07-18 11:06:38 +02:00
Florian Henry
9d942017ee
Merge remote-tracking branch 'origin/develop' into develop_T165
2013-07-18 10:56:57 +02:00
Florian Henry
d5731dd310
[ task #165 ] Add export of multiprices
2013-07-18 10:47:08 +02:00
Florian Henry
0c0a64f532
[ task #924 ] Add numbering rule on task
...
[ task #925 ] Add ODT document generation for Tasks in project module
2013-07-18 10:24:45 +02:00
Florian Henry
ee82330292
On going sync/merge from other repo
2013-07-17 19:17:54 +02:00
Florian Henry
2476e7bcaf
Start functionnality
2013-07-17 18:45:58 +02:00
Laurent Destailleur
7b97214df5
Merge pull request #1096 from FHenry/develop_categorycontact
...
Develop categorycontact
2013-07-17 08:41:02 -07:00
Laurent Destailleur
df88dc2f23
Use a better variable name
2013-07-17 14:57:20 +02:00
Maxime Kohlhaas
1c4c3285e2
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko149
2013-07-17 10:11:54 +02:00
Juanjo Menent
8bae6a774d
Merge pull request #1095 from atm-maxime/develop
...
Fix on turnover reports
2013-07-16 23:47:56 -07:00
Florian Henry
4fee61beb0
Fix adding email into mailing module
...
source_id is already added
2013-07-16 21:34:24 +02:00
Florian Henry
e07eac9b17
[ task #519 ] Add category association with contacts
2013-07-16 21:04:58 +02:00
Maxime Kohlhaas
a6a058ddae
Fix by including lib files
2013-07-16 18:45:40 +02:00
Laurent Destailleur
f564d1912e
New: Add graph for supplier invoices.
...
Fix: Error management into supplier invoice validation.
2013-07-16 18:43:38 +02:00
Laurent Destailleur
efd855b186
Can replace a tag with file into parameter to ouput into list of files.
2013-07-16 17:50:12 +02:00
Maxime Kohlhaas
c0feda4921
Task 149 : added on product
2013-07-16 01:28:24 +02:00
Maxime Kohlhaas
aa8e43cd1b
Task 149 : Add number of notes and attached files into tab. Started with thirdparty
2013-07-16 01:09:19 +02:00
Maxime Kohlhaas
c7f3778b90
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
2013-07-16 00:21:06 +02:00
Laurent Destailleur
2ae1e787c9
Fix: Bad date ranges
...
Conflicts:
scripts/invoices/rebuild_merge_pdf.php
2013-07-15 21:49:54 +02:00
Laurent Destailleur
e2b63bb8dd
Fix: Bad date ranges
2013-07-15 21:47:45 +02:00
Laurent Destailleur
28c28bd217
New: Add option excludethirdparties and onlythirdparties into merge pdf
...
scripts.
2013-07-15 20:56:43 +02:00
Laurent Destailleur
dd10ff8a11
eol
2013-07-15 18:51:56 +02:00
Laurent Destailleur
17f3d98fb3
New: Add option to exclude some thirdparties
2013-07-15 18:44:59 +02:00
Laurent Destailleur
d637212dce
Fix: alternative url were sometimes relative to server, sometimes to
...
DOL_URL_ROOT. Fix to be always relative to DOL_URL_ROOT.
2013-07-15 00:58:40 +02:00
Laurent Destailleur
9c9b81c981
Merge pull request #1092 from atm-maxime/mko862
...
Task 862 : ODT on shipment
2013-07-14 10:21:10 -07:00
Laurent Destailleur
001072d34c
Add option MAIN_GENERATE_DOCUMENT_WITH_PICTURE
2013-07-14 18:43:58 +02:00
Laurent Destailleur
6a1446f4dd
Add option MAIN_GENERATE_DOCUMENT_WITH_PICTURE
2013-07-14 16:35:02 +02:00
Maxime Kohlhaas
9e5286bce9
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko862
...
Conflicts:
htdocs/core/class/html.formfile.class.php
2013-07-14 13:27:41 +02:00
Laurent Destailleur
154cd1fcf9
Fix: Sort on ref for supplier invoice into ged
2013-07-14 01:10:18 +02:00
Laurent Destailleur
460778818c
Fix: automatic ecm for supplier invoices
2013-07-14 01:10:11 +02:00
Laurent Destailleur
1e6171ad0e
Fix: Sort on ref for supplier invoice into ged
2013-07-14 00:40:22 +02:00
Laurent Destailleur
bbe9778ced
Fix: automatic ecm for supplier invoices
2013-07-14 00:09:42 +02:00
Laurent Destailleur
3a9ffb19c3
fix: eol
2013-07-13 21:14:05 +02:00
Laurent Destailleur
7cdc7c0ab2
Fix: Typo
2013-07-13 19:41:27 +02:00
Laurent Destailleur
330d2173be
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-07-13 15:37:30 +02:00
Laurent Destailleur
b5820315f9
Fix: Correct permissions on files
2013-07-13 10:34:19 +02:00
Laurent Destailleur
ad8904a4fb
Can add a picto onto line of files list.
2013-07-12 15:10:32 +02:00
Laurent Destailleur
7cff7d3250
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-07-11 20:22:21 +02:00
Laurent Destailleur
2c0a01fc8c
Merge remote-tracking branch 'origin/3.4' into develop
2013-07-11 17:57:06 +02:00
Maxime Kohlhaas
3c7f4a3548
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko862
...
Conflicts:
htdocs/admin/system/perf.php
2013-07-11 15:55:33 +02:00
Laurent Destailleur
807cbe4163
Add option MAIN_GENERATE_DOCUMENT_WITH_PICTURE
2013-07-11 09:43:07 +02:00
Laurent Destailleur
c174be7100
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-07-10 22:59:39 +02:00
Laurent Destailleur
f690860aa8
Fix: Avoid duplicate div error.
2013-07-10 22:58:53 +02:00
Maxime Kohlhaas
9d931b7b05
Task # 862 : ODT templates on shipment
2013-07-10 15:54:28 +02:00
Laurent Destailleur
57dbf87d0a
Just use print instead of echo, just because echo is not use anuwhere
...
else.
2013-07-10 15:45:16 +02:00
Maxime Kohlhaas
cfc999a06d
Merge
2013-07-10 15:44:53 +02:00
Laurent Destailleur
7ee23a9612
Merge pull request #1085 from csalvador/form_attach_new_file_hook
...
hook in form_attach_new_file(html.formfile.class.php)
2013-07-10 06:42:37 -07:00
Cédric Salvador
9619b09e37
rewriting to fit the new way to use hooks
2013-07-10 15:30:49 +02:00
Laurent Destailleur
a4abfe1abc
New: Can add an event automatically when a projet is create.
2013-07-10 14:46:16 +02:00
Florian Henry
44cd024f89
Fix bug on from_confrim using ajax and radio button question type
2013-07-10 13:10:32 +02:00
Laurent Destailleur
fbf6f150bc
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-07-09 21:41:05 +02:00
Laurent Destailleur
f67e52f42a
Start to clean hook code
2013-07-09 21:40:45 +02:00
Laurent Destailleur
1bff25bf28
Start to clean hookmanager code.
2013-07-09 21:33:45 +02:00
Cédric Salvador
03ad72a1fa
fix dol_buildpath failing when processing path such as file.php?id=__ID__
2013-07-09 18:14:50 +02:00
Cédric Salvador
2fc07d05e9
hook in form_attach_new_file(html.formfile.class.php)
2013-07-09 18:12:43 +02:00
Laurent Destailleur
0ca4e4ffe8
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-07-09 13:51:27 +02:00
Laurent Destailleur
5706779c8b
New: Add a page on performance advice
2013-07-09 13:50:20 +02:00
Laurent Destailleur
c1cb5e9bff
Fix geoipmaxmind module
2013-07-09 00:19:58 +02:00
Florian Henry
3db195cb48
[ bug #971 ] html.form.class.php select_contact with autocomplete do not
...
exclude id from exclude array
2013-07-08 12:51:17 +02:00
Florian Henry
b1b68eafe3
[ bug #972 ] Auto completion contact field do not take account the min
...
caract number before search
2013-07-08 12:47:07 +02:00
Laurent Destailleur
b26250c45a
Fix when alt path is full url instead of relative.
2013-07-07 23:37:56 +02:00
Laurent Destailleur
7c163f7be3
Fix: Running fixdosfile onto all project
2013-07-07 13:17:48 +02:00
Laurent Destailleur
2bc650bf61
Qual: Remove tons of codesniffer errors and warnings.
2013-07-07 13:14:32 +02:00
Laurent Destailleur
7b5e0678db
New: Make some changes to allow usage of alternative
...
$dolibarr_main_url_root variables.
Can now use several alternative path. Fix several bugs with all code.
2013-07-07 03:26:51 +02:00
Laurent Destailleur
5385d87995
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/langs/ca_ES/admin.lang
htdocs/langs/ca_ES/errors.lang
htdocs/langs/ca_ES/main.lang
htdocs/langs/ca_ES/opensurvey.lang
htdocs/langs/ca_ES/paybox.lang
htdocs/langs/ca_ES/products.lang
htdocs/langs/es_ES/admin.lang
htdocs/langs/es_ES/errors.lang
htdocs/langs/es_ES/main.lang
htdocs/langs/es_ES/products.lang
2013-07-05 21:56:54 +02:00
Laurent Destailleur
879cfbbdf3
Merge pull request #1080 from defrance69/patch-4
...
Update modFacture.class.php
2013-07-05 05:59:19 -07:00
Laurent Destailleur
2cdf621b75
New: Provide relativepath as parameter
2013-07-05 14:55:24 +02:00
BENKE Charles
45e32ca3a5
Update modFacture.class.php
...
add 'accountancy_code_sell' to the customer invoice export list
2013-07-05 12:14:27 +02:00
Laurent Destailleur
7cb8809669
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-07-04 00:12:23 +02:00
Laurent Destailleur
eef039e02f
New: [ task #286 ] Enhance rounding function of prices to allow round of
...
sum instead of sum of rounding
2013-07-04 00:11:40 +02:00
Regis Houssin
7e70d935b6
Fix: change for use url of image
2013-07-03 16:07:31 +02:00
Regis Houssin
a9198e66eb
Fix: change for use url of image
2013-07-03 16:06:42 +02:00
Laurent Destailleur
6f5a918373
New: Add option MAIN_MOTD_SETUPPAGE to add a content onto setup page.
...
Also content for MAIN_MOTD_SETUPPAGE, MAIN_MOTD_SETUPPAGE, MAIN_HOME
now accept "|langfile" into translation key to use a specific language
file.
2013-07-02 21:53:34 +02:00
Laurent Destailleur
1beb50e870
Fix: State for turkey
2013-07-02 09:58:09 +02:00
Raphaël Doursenaud
b9ff5188b3
Normalized EOL
2013-07-01 12:00:42 +02:00
Laurent Destailleur
134187ef94
Fix: Overlapping of company name.
...
Fix: Missing state for ome countries.
2013-07-01 00:08:44 +02:00
Laurent Destailleur
10e28fa27a
Fix: Overlapping of company name.
...
Fix: Missing state for ome countries.
2013-07-01 00:05:39 +02:00
Laurent Destailleur
387c213aea
New: Add box for graph of customer orders
2013-06-30 23:01:28 +02:00
Laurent Destailleur
4b00da5fa8
Work on boxes with graph
2013-06-29 02:23:23 +02:00
Laurent Destailleur
d8883dba7f
New: Add new graphical boxes (customer invoices per month).
2013-06-28 19:19:18 +02:00
Laurent Destailleur
4f84b1e774
Fix: Bad error management
2013-06-28 17:55:48 +02:00
Laurent Destailleur
1afef513b1
Fix: Bad error management
2013-06-28 17:44:34 +02:00
Laurent Destailleur
c276283d9f
New: Add errorsToString function
2013-06-28 12:44:17 +02:00
Laurent Destailleur
314d45a9ee
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/langs/el_GR/admin.lang
htdocs/langs/fr_FR/admin.lang
htdocs/langs/it_IT/admin.lang
htdocs/langs/nb_NO/admin.lang
htdocs/langs/nl_NL/admin.lang
htdocs/langs/pt_BR/admin.lang
htdocs/langs/pt_PT/admin.lang
htdocs/langs/sl_SI/admin.lang
htdocs/langs/zh_TW/admin.lang
2013-06-28 00:52:09 +02:00
Laurent Destailleur
dc22b5a50a
Merge remote-tracking branch 'origin/3.3' into 3.4
...
Conflicts:
htdocs/core/modules/mailings/modules_mailings.php
2013-06-28 00:24:13 +02:00
Laurent Destailleur
7e74d9890b
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-06-27 17:47:03 +02:00
Laurent Destailleur
c92aa1f6aa
New: dol_strintotime accept format YYYY-MM-DD HH:MM:SS
...
Fix: create member was missing field import_key
New: Uniformize code
2013-06-27 17:45:58 +02:00
Florian Henry
469e700895
Fix bug pgsql : add mail directly into mailling
2013-06-27 14:35:41 +02:00
jfefe
b513bd7b84
Fix : bad element type name for company extrafields into export
2013-06-27 14:30:49 +02:00
jfefe
162fc6e6dd
Remove debug info
2013-06-27 13:45:06 +02:00
jfefe
2f6361658a
Can choose several fields to display with extrafield list of table
2013-06-27 13:35:28 +02:00
Laurent Destailleur
b5b07f8a14
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-06-26 16:46:01 +02:00
Laurent Destailleur
696ad07871
LF
2013-06-26 16:45:42 +02:00
Laurent Destailleur
58bdac2dcd
Merge pull request #1066 from atm-maxime/develop
...
Add search on siren (idprof1)
2013-06-26 07:41:07 -07:00
Cédric Salvador
117ddbdff2
add columns if active hooks use the formBuilddocLineOptions method
2013-06-26 15:20:42 +02:00
Cédric Salvador
bfedddd95e
init hook
2013-06-26 15:20:16 +02:00
Cédric Salvador
df94f3816c
add hook to add line options in html.formfile.class.php
2013-06-26 15:19:59 +02:00
Laurent Destailleur
9a5b55219a
Fix: CSS
2013-06-26 14:40:29 +02:00
Laurent Destailleur
1de8ab3785
Fix: CSS
2013-06-26 14:38:56 +02:00
Laurent Destailleur
9b235f6879
Fix: Remove space at end of binary files
2013-06-26 02:05:18 +02:00
Laurent Destailleur
af4651f1a2
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
build/perl/virtualmin/dolibarr.pl
htdocs/core/lib/files.lib.php
htdocs/langs/en_US/projects.lang
htdocs/langs/fr_FR/projects.lang
htdocs/public/paybox/paymentko.php
htdocs/public/paybox/paymentok.php
htdocs/public/paypal/paymentko.php
htdocs/public/paypal/paymentok.php
htdocs/webservices/server_other.php
2013-06-25 23:22:00 +02:00
Laurent Destailleur
8359a34545
Merge remote-tracking branch 'origin/3.3' into 3.4
...
Conflicts:
ChangeLog
build/debian/changelog
build/exe/doliwamp/doliwamp.iss
build/makepack-dolibarr.pl
build/perl/virtualmin/dolibarr.pl
build/rpm/dolibarr_fedora.spec
build/rpm/dolibarr_generic.spec
build/rpm/dolibarr_mandriva.spec
build/rpm/dolibarr_opensuse.spec
htdocs/compta/facture/class/facture-rec.class.php
htdocs/core/menus/standard/eldy.lib.php
htdocs/filefunc.inc.php
2013-06-25 21:31:24 +02:00
Laurent Destailleur
2af8f295b1
Fix: warning not always visible. Depends if addon modules were
...
installed. Var should provide a quick fix.
2013-06-25 21:25:09 +02:00
Laurent Destailleur
0ec4b3bcdb
Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4
2013-06-25 18:10:55 +02:00
Laurent Destailleur
285ea8da3f
More info into log
2013-06-25 15:47:59 +02:00
jfefe
54bf3fd516
Add parameter to force user in dol_check_access_document function
...
This required by webservice where global $user is not available
2013-06-25 15:09:51 +02:00
Laurent Destailleur
c2654fa7e2
Fix: Bad translation. Must use a different string than products
2013-06-25 15:00:10 +02:00
Maxime Kohlhaas
76870622e4
Add turnover report by product / serv
2013-06-25 14:54:29 +02:00
simnandez
ca190be382
[Bug #958 ] LocalTax2 for Spain fails on Suppliers
2013-06-25 11:21:56 +02:00
simnandez
065b30f0d0
[Bug #958 ] LocalTax2 for Spain fails on Suppliers
2013-06-25 11:12:21 +02:00
Laurent Destailleur
1d8b9949d6
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/compta/bank/annuel.php
htdocs/compta/bank/categ.php
htdocs/compta/bank/releve.php
htdocs/core/class/hookmanager.class.php
htdocs/core/class/html.formfile.class.php
htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
htdocs/core/tpl/contacts.tpl.php
htdocs/cron/list.php
htdocs/main.inc.php
htdocs/public/paybox/paymentko.php
htdocs/public/paybox/paymentok.php
htdocs/public/paypal/paymentko.php
htdocs/public/paypal/paymentok.php
htdocs/theme/bureau2crea/style.css.php
htdocs/theme/eldy/style.css.php
htdocs/user/class/user.class.php
htdocs/viewimage.php
2013-06-24 20:02:02 +02:00
Laurent Destailleur
f8f0b08bfc
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-06-24 18:33:00 +02:00
Laurent Destailleur
a8547b5375
New: Add property hidden into module descriptor to allow to hide a
...
module according to some dynamic conditions.
2013-06-24 18:31:56 +02:00
Regis Houssin
4cd6ae6bbd
Fix: convert lines delimiters
2013-06-24 17:36:33 +02:00
Regis Houssin
05bd035488
Fix: convert line delimiters
2013-06-24 17:34:22 +02:00
Regis Houssin
cb9dcfa369
Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4
2013-06-24 17:13:39 +02:00
Regis Houssin
aa7e61178a
New: add product price sharing for multicompany
2013-06-24 17:13:08 +02:00
Regis Houssin
9992bebb13
New: add product price sharing for multicompany
2013-06-24 17:12:41 +02:00
Laurent Destailleur
ec2e3db450
New: Switch cron module to status stable. Thanks to everybody to test
...
this new module and debug it.
2013-06-23 22:21:21 +02:00
Laurent Destailleur
7fb8a740e7
Fix: bad function
2013-06-23 18:54:18 +02:00
Laurent Destailleur
b49a1168e3
Fix: Use div for tables when there is a different form on each line.
2013-06-23 18:33:03 +02:00
Laurent Destailleur
0ab500d3a7
Merge pull request #1063 from grandoc/develop
...
standardize code
2013-06-21 08:10:01 -07:00
Laurent Destailleur
570275cd76
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/langs/fr_FR/admin.lang
htdocs/langs/fr_FR/opensurvey.lang
htdocs/opensurvey/public/index.php
2013-06-21 15:37:17 +02:00
Laurent Destailleur
253ce19bc1
Fix: Bad position of field
2013-06-21 15:26:46 +02:00
Laurent Destailleur
7e748f26a6
Fix: all forms must react same way with option optimize_small_screen
2013-06-20 16:39:17 +02:00
Grand Philippe
b599481ef6
standardize code
2013-06-20 09:18:12 +02:00
Laurent Destailleur
f987fd2245
Fix: Inconsistency arrays into php function
2013-06-19 23:46:46 +02:00
Laurent Destailleur
7f660302e2
Fix: Inconsistency arrays into php function
2013-06-19 23:46:18 +02:00
Laurent Destailleur
ec2e4c8a8b
Fix: parenthesis at wrong place
2013-06-19 22:58:35 +02:00
Laurent Destailleur
aaad4d3474
Fix: Menu cheque depends on bank module and not invoice.
2013-06-19 19:52:20 +02:00
Laurent Destailleur
5667fceba8
Merge pull request #1061 from GPCsolutions/group_concat
...
Added group_concat equivalent to PgSQL
2013-06-19 09:34:38 -07:00
Laurent Destailleur
374718f735
Merge pull request #1056 from FHenry/dev_projecthtmlform
...
Continue normalizing project html.formprojet.class.php
2013-06-19 09:32:35 -07:00
Laurent Destailleur
2a014f8c7c
Merge pull request #1057 from marcosgdf/develop
...
CR Fix
2013-06-19 09:31:28 -07:00
Laurent Destailleur
b5f4c45cf0
Merge remote-tracking branch 'origin/3.4' into develop
2013-06-19 18:14:19 +02:00
Laurent Destailleur
09317e2034
Fix: Pb with firstname/lastname and font size
2013-06-19 18:12:05 +02:00
Laurent Destailleur
0b53f72779
Fix: Pb with firstname/lastname and font size
2013-06-19 18:08:05 +02:00
Laurent Destailleur
5cb2ba3909
Several fixes in CSS
...
Conflicts:
htdocs/core/menus/standard/empty.php
2013-06-19 17:02:09 +02:00
Laurent Destailleur
9bd41e94b5
Fix: Pb in css
2013-06-19 17:00:01 +02:00
Laurent Destailleur
850ee5e195
Several fixes in CSS
2013-06-19 16:59:03 +02:00
Raphaël Doursenaud
2f8954acb3
Added group_concat equivalent to PgSQL
2013-06-19 15:54:27 +02:00
Laurent Destailleur
51d40b94cc
Fix: Pb in css
2013-06-19 15:52:06 +02:00
Marcos García
4532399026
CR Fix
...
I'm getting tired of these commits...
2013-06-19 09:26:20 +02:00
Laurent Destailleur
965b173451
Fix: hooks for leftmenu must not be loaded if left menu hidden, also
...
hooks were lost into page search_page.
2013-06-19 00:12:35 +02:00
Laurent Destailleur
bd8271ee24
Fix: hooks for leftmenu must not be loaded if left menu hidden, also
...
hooks were lost into page search_page.
2013-06-19 00:11:42 +02:00
Laurent Destailleur
c45cd3aa1c
Fix: Tab must not always be visible
2013-06-18 21:44:18 +02:00
Laurent Destailleur
71b61fc1f5
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/core/class/html.formfile.class.php
htdocs/langs/fr_FR/mails.lang
htdocs/user/logout.php
2013-06-18 09:51:37 +02:00
Florian Henry
8a6a3fc9f4
Continue normalizing project html.formprojet.class.php
2013-06-17 14:25:33 +02:00
Laurent Destailleur
834a3fd3c5
Qual: Clean code. Removed useless functions and params
2013-06-17 14:12:59 +02:00
Laurent Destailleur
869e877cb7
Qual: We must not concat currency symbol after a price, but use the
...
parameter currency of method price.
2013-06-17 11:58:55 +02:00
Laurent Destailleur
7ec8220826
Merge pull request #1054 from marcosgdf/develop
...
CR fix
2013-06-16 15:05:28 -07:00
Laurent Destailleur
9012c49299
Perf: Optimize class loading. Need 1 MB less of memory to load home
...
page.
2013-06-16 23:15:20 +02:00
Marcos García
bf2d61515d
CR fix
...
Git required me to commit these changes
2013-06-16 21:33:05 +02:00
Laurent Destailleur
c748f3d834
Qual: Removed useless methods
...
Qual: Removed deprecated vars
Qual: Free memory
2013-06-16 21:31:21 +02:00
Laurent Destailleur
c83bce262e
Fix: Do not show time if start time was not calculated
2013-06-16 20:22:32 +02:00
Laurent Destailleur
91068a4476
Fix: Pb into form output
...
Conflicts:
htdocs/core/class/html.formfile.class.php
2013-06-16 20:16:05 +02:00
Laurent Destailleur
0690e8c39e
Fix: Pb into form output
2013-06-16 20:08:45 +02:00
Laurent Destailleur
fee958eafb
Add comments
2013-06-16 12:23:00 +02:00
Florian Henry
f2e2815cc1
Merge branch 'develop' into dev_projecthtmlform
2013-06-15 11:56:45 +02:00
Florian Henry
8fb2b8fa12
Start normalize project module : create html.formprojet.class.php with
...
selec_project
2013-06-14 22:33:01 +02:00
Laurent Destailleur
3cd303c944
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/core/class/extrafields.class.php
2013-06-14 19:56:07 +02:00
Laurent Destailleur
0a9cf26a32
Fix: Bad closing of div
2013-06-14 19:51:53 +02:00
Laurent Destailleur
af8c4cd0d3
Fix: Bad closing of div
2013-06-14 19:46:43 +02:00
Laurent Destailleur
2f386b1b36
Fix: Bad closing of div
2013-06-14 19:43:45 +02:00
Laurent Destailleur
3b88142ba8
Fix: Import of extra field for members
2013-06-14 02:41:08 +02:00
Laurent Destailleur
13b3a3c850
Fix: Export of extra field for members
2013-06-14 02:35:30 +02:00
Laurent Destailleur
a9edbf4f24
Fix: Bad size of image
2013-06-14 02:25:44 +02:00
Laurent Destailleur
8ed5dfeded
Fix: Bad styles of html elements
2013-06-14 02:15:43 +02:00
Laurent Destailleur
b3ca9de399
Fix: Update select with list
2013-06-14 02:09:34 +02:00
Laurent Destailleur
93c71d00f7
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/comm/mailing/cibles.php
htdocs/core/class/hookmanager.class.php
2013-06-12 22:17:15 +02:00
Laurent Destailleur
a50cd7b698
Fix bug into script that fix CRLF into LF
2013-06-12 11:59:55 +02:00
Laurent Destailleur
0b35217481
Start to debug/fix module IPP
2013-06-12 11:35:30 +02:00
Laurent Destailleur
0c9bc2ac5f
Merge branch 'develop' of https://github.com/frederic34/dolibarr into
...
frederic34-develop
Conflicts:
htdocs/commande/fiche.php
htdocs/compta/facture.php
2013-06-12 10:47:56 +02:00
Florian Henry
b4485efdeb
Merge branch 'develop' into develop_926_927_928
...
Conflicts:
htdocs/core/class/extrafields.class.php
Change-Id: Ia54e1be6954bc28f81122e88e398bda8059ab536
2013-06-11 21:41:57 +02:00
Laurent Destailleur
897d1251c8
Fix: Better fix for cleaning vars (i'm tired today)
2013-06-11 12:10:02 +02:00
Laurent Destailleur
40cd45c166
Fix: Better fix for cleaning vars
2013-06-11 12:01:12 +02:00
Laurent Destailleur
8f3ba0dacc
Fix: Better fix for cleaning vars
2013-06-11 11:49:59 +02:00
Laurent Destailleur
4326bfb606
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/langs/tr_TR/admin.lang
htdocs/langs/tr_TR/agenda.lang
htdocs/langs/tr_TR/banks.lang
htdocs/langs/tr_TR/bills.lang
htdocs/langs/tr_TR/bookmarks.lang
htdocs/langs/tr_TR/boxes.lang
htdocs/langs/tr_TR/cashdesk.lang
htdocs/langs/tr_TR/categories.lang
htdocs/langs/tr_TR/commercial.lang
htdocs/langs/tr_TR/companies.lang
htdocs/langs/tr_TR/compta.lang
htdocs/langs/tr_TR/contracts.lang
htdocs/langs/tr_TR/deliveries.lang
htdocs/langs/tr_TR/dict.lang
htdocs/langs/tr_TR/donations.lang
htdocs/langs/tr_TR/ecm.lang
htdocs/langs/tr_TR/errors.lang
htdocs/langs/tr_TR/exports.lang
htdocs/langs/tr_TR/externalsite.lang
htdocs/langs/tr_TR/ftp.lang
htdocs/langs/tr_TR/help.lang
htdocs/langs/tr_TR/holiday.lang
htdocs/langs/tr_TR/install.lang
htdocs/langs/tr_TR/interventions.lang
htdocs/langs/tr_TR/languages.lang
htdocs/langs/tr_TR/ldap.lang
htdocs/langs/tr_TR/mailmanspip.lang
htdocs/langs/tr_TR/mails.lang
htdocs/langs/tr_TR/main.lang
htdocs/langs/tr_TR/margins.lang
htdocs/langs/tr_TR/members.lang
htdocs/langs/tr_TR/orders.lang
htdocs/langs/tr_TR/oscommerce.lang
htdocs/langs/tr_TR/other.lang
htdocs/langs/tr_TR/paybox.lang
htdocs/langs/tr_TR/paypal.lang
htdocs/langs/tr_TR/products.lang
htdocs/langs/tr_TR/projects.lang
htdocs/langs/tr_TR/propal.lang
htdocs/langs/tr_TR/sendings.lang
htdocs/langs/tr_TR/shop.lang
htdocs/langs/tr_TR/sms.lang
htdocs/langs/tr_TR/stocks.lang
htdocs/langs/tr_TR/suppliers.lang
htdocs/langs/tr_TR/trips.lang
htdocs/langs/tr_TR/users.lang
htdocs/langs/tr_TR/withdrawals.lang
htdocs/langs/tr_TR/workflow.lang
2013-06-11 10:43:36 +02:00
Laurent Destailleur
5f9f709a70
Fix: vars must be cleaned for next call
2013-06-11 10:21:28 +02:00
Regis Houssin
d9f2ad4ff4
Revert "Fix: hookmanager code"
...
This reverts commit 89c3cfec3a
2013-06-11 09:36:39 +02:00
Laurent Destailleur
1c8edb9cb5
Use currency symbol instead of text
2013-06-11 02:06:34 +02:00
Laurent Destailleur
f4fd71d1f9
Fix: Bad position of currency for USD
2013-06-11 02:05:40 +02:00
Laurent Destailleur
1f95c5d59f
Revert "Fix: hookmanager code"
...
This reverts commit 2bdf900db9
2013-06-11 00:08:15 +02:00
Regis Houssin
2bdf900db9
Fix: hookmanager code
...
Conflicts:
htdocs/core/lib/pdf.lib.php
Change-Id: I4dac5a939abdcbe60fcd1bb21465fabde1324089
2013-06-10 19:51:07 +02:00
Regis Houssin
89c3cfec3a
Fix: hookmanager code
2013-06-10 19:46:37 +02:00
Laurent Destailleur
482a771e7c
Fix: Some quality fixes
2013-06-10 19:04:04 +02:00
Laurent Destailleur
48b33a7678
Merge pull request #1036 from defrance69/patch-20
...
Create html.formcontract.class.php
2013-06-10 09:06:41 -07:00
Laurent Destailleur
a925d8d535
Merge remote-tracking branch 'origin/3.4' into develop
2013-06-10 17:01:24 +02:00
Florian Henry
9f03074127
- New: [ task #926 ] Add extrafield feature on order lines
...
- New: [ task #927 ] Add extrafield feature on Proposal lines
- New: [ task #928 ] Add extrafield feature on invoice lines
2013-06-10 16:05:41 +02:00
Florian Henry
4f43ec0acf
Add extrafield tables
2013-06-10 14:13:44 +02:00
BENKE Charles
6167fedff8
Create html.formcontract.class.php
...
Add select_contract function who create à lisbox of contract
2013-06-09 22:08:05 +03:00
Laurent Destailleur
b8f721092f
Removed useless comments
2013-06-09 18:36:47 +02:00
Laurent Destailleur
0aab0cca75
Fix doxygen
2013-06-09 18:29:06 +02:00
Laurent Destailleur
88291e423f
Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4
2013-06-09 18:24:52 +02:00
Laurent Destailleur
f78240c067
Doxygen
2013-06-09 18:24:30 +02:00
Florian Henry
4f438224d7
Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4
2013-06-09 16:56:47 +02:00
Florian Henry
646be9b984
Fix bug on extrafeild type price and double
2013-06-09 16:56:29 +02:00
Laurent Destailleur
51d11ff190
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/compta/facture/stats/index.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/pdf.lib.php
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
htdocs/core/modules/propale/doc/pdf_azur.modules.php
htdocs/includes/tcpdf/tcpdf.php
htdocs/langs/el_GR/other.lang
htdocs/langs/en_US/cashdesk.lang
htdocs/langs/en_US/main.lang
htdocs/langs/es_ES/products.lang
htdocs/main.inc.php
test/phpunit/NumberingModulesTest.php
2013-06-09 16:49:47 +02:00
Laurent Destailleur
49d65e5ebe
Fix: criteria of select
2013-06-09 03:10:31 +02:00
Marcos García
f0454926c2
Fix bug #933 : Ajax error
...
Caused by commit 7e53f98
2013-06-08 22:29:18 +02:00
Marcos García
3b28de0a07
Fixed some translation problems
2013-06-08 21:57:57 +02:00
Laurent Destailleur
5a77828e62
New: Add object_hour as substitution tag for opendocument generation.
2013-06-08 18:12:32 +02:00
Laurent Destailleur
bd4ca9f1ed
Merge remote-tracking branch 'origin/3.3' into 3.4
2013-06-08 16:55:49 +02:00
Laurent Destailleur
49dcc32374
Fix: Param lang forbidden into price function
2013-06-08 16:53:26 +02:00
Laurent Destailleur
b4abe58237
Merge remote-tracking branch 'origin/3.3' into 3.4
...
Conflicts:
htdocs/core/lib/pdf.lib.php
2013-06-08 16:49:02 +02:00
Laurent Destailleur
5d1dfdc7c1
Upgrade tcpdf to 6.0
2013-06-08 16:29:59 +02:00
Laurent Destailleur
2c71c898eb
Fix: param lang not provided to price function
2013-06-08 15:21:47 +02:00
Laurent Destailleur
319295554d
Fix: Free memory after request
2013-06-08 00:52:02 +02:00
Laurent Destailleur
9fae9da6a1
Fix: proxy was not used everywhere, timeout was not set everywhere.
2013-06-07 20:09:15 +02:00
Laurent Destailleur
c3f5e0c6ee
New: Show version of client lib used by mysql drivers
2013-06-07 19:19:11 +02:00
Laurent Destailleur
421c3fb35b
Fix: Bad param 'zone' into printCommon
2013-06-07 13:41:32 +02:00
Laurent Destailleur
35fbc9b066
- New: Can enable tuning info from option MAIN_SHOW_TUNING_INFO.
2013-06-07 12:43:41 +02:00
Laurent Destailleur
693f4f3b8b
Fix: Pb of offset in numbering. Add also phpunit test to detect and test
...
fix.
Conflicts:
test/phpunit/NumberingModulesTest.php
2013-06-06 21:25:10 +02:00
Laurent Destailleur
21c6d42d82
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-06-06 21:19:03 +02:00
Laurent Destailleur
31fe378f3b
Fix: Pb of offset in numbering. Add also phpunit test to detect and test
...
fix.
2013-06-06 21:18:50 +02:00
Cédric Salvador
8ad2fad817
fixed select_thirdparty_list call in the select_company function
2013-06-06 18:31:52 +02:00
Cédric Salvador
b747b0349d
merge
2013-06-06 18:31:33 +02:00
Laurent Destailleur
b7f697e8c4
Remove a call of a deprecated function
2013-06-05 22:27:02 +02:00
Laurent Destailleur
7e53f98baa
Qual: Uniformize code
2013-06-05 22:01:35 +02:00
Laurent Destailleur
52407f88c4
Merge remote-tracking branch 'origin/3.4' into develop
2013-06-05 21:59:23 +02:00
Laurent Destailleur
61d5359f23
Fix: Uniformize menu entries
2013-06-05 21:55:51 +02:00
Laurent Destailleur
e25651204c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/core/lib/admin.lib.php
2013-06-05 18:56:41 +02:00
Regis Houssin
c9a71439b2
Fix: EOF
2013-06-05 16:24:32 +02:00
Laurent Destailleur
ebb8f05f09
Subscription to ML can also be done according to member type
2013-06-05 15:53:27 +02:00
Laurent Destailleur
eac4aa7e28
New: Module mailman can subscribe/unsubscribe to ML according to
...
categories of member.
2013-06-05 15:44:42 +02:00
Laurent Destailleur
eadfa66f2c
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/core/class/infobox.class.php
2013-06-04 22:59:28 +02:00
Laurent Destailleur
c6c4a83850
Fix: Removed deprecated code fo local tax type 7 since we can use now
...
the fiscal stamp that is a better implementation.
2013-06-04 12:04:04 +02:00
Laurent Destailleur
22bde298de
Fix: First permission must start with 1
2013-06-03 23:06:15 +02:00
Laurent Destailleur
e871ea64eb
Fix: Regression
2013-06-03 19:52:34 +02:00
Laurent Destailleur
1aa5535741
New: Add function to get http content
2013-06-03 17:44:55 +02:00
Laurent Destailleur
c1dd2f20cd
Qual: Clean code.
2013-06-03 15:18:36 +02:00
Laurent Destailleur
1ff175f14e
Fix: Bad regex
2013-06-03 12:46:25 +02:00
Laurent Destailleur
4b3413c84c
Fix: Loading of boxes from external modules
2013-06-03 12:43:14 +02:00
Laurent Destailleur
7dc984fd6f
Fix: Loading of boxes from external modules
2013-06-03 11:33:13 +02:00
Laurent Destailleur
a1a8fac25c
Merge remote-tracking branch 'origin/3.4' into develop
2013-06-03 11:15:15 +02:00
Laurent Destailleur
c5783215c4
Fix: Var not initialized
...
Fix: Pb of duplicate run of javascript with jmobile
2013-06-01 23:46:36 +02:00
Laurent Destailleur
8348596aea
Fix: Var not initialized
...
Fix: Pb of duplicate run of javascript with jmobile
2013-06-01 23:45:03 +02:00
Laurent Destailleur
b3b80701fd
Fix: Bug with jmobile
2013-06-01 02:03:19 +02:00
Laurent Destailleur
743da5a214
Fix: function to get localtax1 or 2 value from vat rate return bad value
...
when countries differs.
Conflicts:
htdocs/langs/fr_CA/main.lang
2013-05-31 21:33:48 +02:00
Laurent Destailleur
92346296f0
Doxygen
2013-05-31 21:17:49 +02:00
Laurent Destailleur
a85fea9317
Fix: function to get localtax1 or 2 value from vat rate return bad value
...
when countries differs.
2013-05-31 21:03:24 +02:00
Laurent Destailleur
da73a8d84c
Fix: syntax error
...
Fix: Bad field param
2013-05-31 16:39:34 +02:00
Laurent Destailleur
a5962a410e
Fix: Bad param used
2013-05-31 16:35:32 +02:00
Laurent Destailleur
5254f102ba
Fix: Solve duplicate js and solve jmobile problem of cache.
2013-05-31 16:34:02 +02:00
Laurent Destailleur
ba6d82686f
Fix: Menu dictionnary
2013-05-31 14:54:10 +02:00
Laurent Destailleur
0ec32afd8d
Fix: syntax error
...
Fix: Bad field param
2013-05-31 13:30:24 +02:00
Laurent Destailleur
c285f81844
Fix: Bad param used
2013-05-31 13:21:01 +02:00
Laurent Destailleur
da40c460bb
Fix: Solve duplicate js and solve jmobile problem of cache.
2013-05-31 10:56:48 +02:00
simnandez
7fa0d6cffa
Fix: [ bug #916 ] Same for Thirds and Members
2013-05-30 18:00:08 +02:00
simnandez
5fa2598a6f
Fix: [ bug #916 ] Same for Thirds and Members
2013-05-30 17:58:48 +02:00
Laurent Destailleur
5bba5782a4
Merge remote-tracking branch 'origin/3.4' into develop
2013-05-29 21:22:27 +02:00
Laurent Destailleur
b36a10babf
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-05-29 21:05:48 +02:00
simnandez
4f9b5883df
Fix: [ bug #916 ] Products complementary attributes, imports and
...
multicompany
Fix: [ bug #917 ] Missing field type in products complementary
attributes imports
No Changelog Update need, because complementary attributes is new in 3.4
2013-05-29 18:18:24 +02:00
simnandez
00395c87a8
Fix: [ bug #916 ] Products complementary attributes, imports and
...
multicompany
Fix: [ bug #917 ] Missing field type in products complementary
attributes imports
No Changelog Update need, because complementary attributes is new in 3.4
2013-05-29 18:17:39 +02:00
Laurent Destailleur
e6c93424ce
Qual: Normalized tabs
2013-05-29 15:41:59 +02:00
Laurent Destailleur
b2600e8880
Fix: Missing trans
2013-05-29 02:20:30 +02:00
Laurent Destailleur
1cb33c43bd
Merge remote-tracking branch 'origin/3.3' into 3.4
...
Conflicts:
htdocs/comm/action/listactions.php
htdocs/core/class/commonobject.class.php
htdocs/core/lib/agenda.lib.php
htdocs/product/liste.php
2013-05-29 01:30:36 +02:00
Laurent Destailleur
f8e019248d
Fix: But siwtiching to auguria menu.
2013-05-29 01:24:57 +02:00
Laurent Destailleur
9ab8f4c6a3
Merge pull request #998 from FHenry/develop
...
Develop
2013-05-28 15:23:29 -07:00
Laurent Destailleur
b87350e2d6
Merge pull request #994 from defrance69/patch-13
...
Update modSociete.class.php
2013-05-28 15:09:45 -07:00
Florian Henry
8a726ab51b
Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4
2013-05-28 21:51:11 +02:00
Florian Henry
23c25066d3
Change comment on dol_include_once
2013-05-28 17:54:55 +02:00
Florian Henry
3ddb410e2e
Change comment on dol_include_once method
2013-05-28 17:53:56 +02:00
BENKE Charles
aa06a0b113
Update modSociete.class.php
...
enhance filter on export of contact
add postorfunction field in export of contact
2013-05-28 15:37:08 +02:00
Laurent Destailleur
dc7b4ebc79
Fix: But siwtiching to auguria menu.
2013-05-28 13:54:29 +02:00
Florian Henry
f543f00024
Fix PGSQL Bugs
...
Removing parenthesis make query works for MySQL and PgSQL
2013-05-26 10:34:00 +02:00
Florian Henry
56556ba222
Fix [ bug #911 ] Reorder intervention do not work
2013-05-26 10:15:43 +02:00
Laurent Destailleur
2005ce8d6e
Fix: Error with jmobile
2013-05-26 05:02:46 +02:00
Laurent Destailleur
f3f4dec96e
Fix: Error with jmobile
2013-05-26 05:01:28 +02:00
Laurent Destailleur
2cac1f4c9c
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/core/lib/functions2.lib.php
2013-05-25 18:14:15 +02:00
Laurent Destailleur
7b13be4653
Merge pull request #978 from atm-maxime/3.4
...
Fix : Reset every month with @99 was not working properly (for 3.4 branc...
2013-05-25 01:59:15 -07:00
Laurent Destailleur
e8f72fd401
Merge pull request #979 from defrance69/patch-9
...
Update modFournisseur.class.php
2013-05-25 01:52:30 -07:00
Laurent Destailleur
701d8485ef
Merge remote-tracking branch 'origin/3.4' into develop
2013-05-24 19:00:16 +02:00
BENKE Charles
ed67173734
Update modFournisseur.class.php
...
Add filter feature on the commande export
2013-05-24 16:17:36 +02:00
Laurent Destailleur
7bbdae239f
Fix: Removed errors with not defined vars
2013-05-24 14:32:12 +02:00
Maxime Kohlhaas
f66750d5e7
Fix : Reset every month with @99 was not working properly (for 3.4 branch)
2013-05-24 11:23:56 +02:00
Maxime Kohlhaas
53c6638a90
Reset every month with @99 was not working properly.
2013-05-23 11:07:56 +02:00
Laurent Destailleur
ee84457104
Fix: not defined default value
2013-05-23 10:04:35 +02:00
Lukas Prömer
bb42f8384b
Fix: 'rights' instead of 'right'
2013-05-22 16:31:50 +02:00
Lukas Prömer
f1d9a6545c
Fix: 'rights' instead of 'right'
2013-05-22 14:59:21 +02:00
Laurent Destailleur
469ae91e70
Fix: regression
2013-05-22 12:02:39 +02:00
Laurent Destailleur
edf00db0e0
Merge pull request #970 from FHenry/develop
...
Add generic behaviour in showphoto of html.form.class.php
2013-05-22 02:57:21 -07:00
Laurent Destailleur
1109527528
Merge pull request #968 from FHenry/3.3
...
3.3
2013-05-22 02:56:06 -07:00
Laurent Destailleur
f21b149361
Merge pull request #969 from FHenry/3.4
...
Fix bug in DDLCreateTable
2013-05-22 02:55:26 -07:00
fhenry
40827a7ef3
Add generic behaviour in showphoto of html.form.class.php
2013-05-21 14:52:39 +02:00
fhenry
b36a16ed43
Change-Id: I2e25d4b82388f6a0fc83b97f9162a095247e3fa1
2013-05-21 14:32:30 +02:00
fhenry
13ad88832c
Fix bug in DDLCreateTable
2013-05-21 14:31:39 +02:00
fhenry
f08ce6d96a
Fix bug on DDLCreateDb in Mysql
2013-05-21 14:28:42 +02:00
Laurent Destailleur
12681994ea
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
ChangeLog
htdocs/comm/propal.php
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/fichinter/class/fichinter.class.php
htdocs/fichinter/fiche.php
2013-05-20 21:21:03 +02:00
Laurent Destailleur
71e14df62f
Merge remote-tracking branch 'origin/3.3' into 3.4
...
Conflicts:
ChangeLog
htdocs/comm/propal.php
htdocs/core/class/commonobject.class.php
htdocs/core/tpl/freeproductline_create.tpl.php
htdocs/core/tpl/predefinedproductline_create.tpl.php
2013-05-20 17:37:08 +02:00
Laurent Destailleur
416cdd2f9c
Merge pull request #956 from cbattarel/3.3
...
fix bug : external users should not see costprice and margin infos
2013-05-20 07:39:39 -07:00
Christophe Battarel
f8ca842685
fix typo error
2013-05-20 10:10:34 +02:00
fhenry
cb182752cc
Report divert bug fixing from 3.4
2013-05-19 18:47:14 +02:00
Christophe Battarel
347fc6d714
fix unauthorized access to margins for external user
2013-05-19 14:04:21 +02:00
Juanjo Menent
a7e0f8cb8e
Merge pull request #958 from atm-maxime/develop
...
Add mobile phone in contact export
2013-05-19 02:54:44 -07:00
fhenry
6190dddac9
GetElmentURL fichinter instead of ficheinter (to be ok with element of
...
fichinter class
2013-05-19 11:30:35 +02:00
fhenry
181ce52223
Add ficheinter in GetElementURL for action
2013-05-18 22:17:46 +02:00
fhenry
cbf29e20a2
[ task #901 ] Add Extrafeild on Fiche Inter
2013-05-18 13:00:36 +02:00
fhenry
fefb21a56e
Fix bug on Extrafield checkbox
...
Fix bug on ActionComm Update
[ task #900 ] Review code of ficheinter.class.php
2013-05-18 12:17:43 +02:00
simnandez
eb7254cccb
Fix: Remove windows CR/LF
2013-05-18 09:19:03 +02:00
simnandez
e2f2ad30ae
Fix: Remove windows CR/LF
2013-05-18 09:15:18 +02:00
simnandez
2879a09a03
Fix: Remove windows CR/LF
2013-05-18 09:11:24 +02:00
fhenry
1c1736fa20
Fix bad Warning: Bad formed request converted PGSQL
2013-05-17 19:30:48 +02:00
Maxime Kohlhaas
57212d7db8
Add mobile phone in contact export
2013-05-17 17:29:41 +02:00
Christophe Battarel
e3615d43bd
fix bug : external users should not see costprice and margin infos
2013-05-17 15:02:27 +02:00
fhenry
faa2399b80
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop
Conflicts:
ChangeLog
Change-Id: I7abbbefde190dbe86f8cb7ae43451da9eca1c9aa
2013-05-17 09:49:06 +02:00
Laurent Destailleur
fdd8d2cc5e
Fix: to large a href
2013-05-17 01:30:39 +02:00
Laurent Destailleur
393ad1447a
Qual: Uniformize permission code between viewimage.php and document.php
2013-05-16 15:46:54 +02:00
Laurent Destailleur
658f0af428
Fix: Removed warning
2013-05-16 15:13:08 +02:00
Laurent Destailleur
ad5a350073
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-05-16 15:06:13 +02:00
Laurent Destailleur
bae17bc39b
Fix: Removed warning
2013-05-16 12:37:46 +02:00
Laurent Destailleur
fb92e13650
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
scripts/invoices/email_unpaid_invoices_to_customers.php
scripts/invoices/email_unpaid_invoices_to_representatives.php
2013-05-15 22:35:41 +02:00
Laurent Destailleur
ff94849b0c
Fix: Security test
2013-05-15 19:57:51 +02:00
Laurent Destailleur
49735b8d39
New: Add option "filter=bank" onto script rebuild_merge_pdf.php to
...
merge PDF that has one payment on a specific bank account.
2013-05-15 17:52:56 +02:00
fhenry
721e074072
Better wulity code for Task 532
2013-05-15 14:25:33 +02:00
fhenry
be525ad0e8
Better code quality for [ task #531 ] Add a duration on tasks
2013-05-15 14:19:16 +02:00
Laurent Destailleur
b17fe9fc00
New: Export support now autosize of column for excel export.
...
Fix: Bad charset when using script export-bank-receipts.
2013-05-15 13:37:31 +02:00
Laurent Destailleur
96dc851161
Doxygen
2013-05-15 13:24:18 +02:00
Laurent Destailleur
f6dfcb756c
Text cells must be left align into excel 2007 export.
2013-05-14 23:54:22 +02:00
fhenry
7de861eee4
Beteer display
2013-05-14 20:30:18 +02:00
fhenry
6727ab34ed
Review style hideonsmartphone
2013-05-14 20:25:34 +02:00
fhenry
d0b4cef7a4
Change duration _planned by planned_workload
2013-05-14 20:22:33 +02:00
Regis Houssin
047aa8ea29
Fix: avoid error when multiple files uploaded
2013-05-14 15:59:47 +02:00
Regis Houssin
d2aacdb04b
Fix: avoid error when multiple files uploaded
2013-05-14 15:58:59 +02:00
Regis Houssin
179fc0a4cb
Fix: avoid error when multiple files uploaded
2013-05-14 15:58:20 +02:00
Laurent Destailleur
551bcba826
Fix: Try to avoid warning
2013-05-14 10:51:09 +02:00
fhenry
f98442d700
Remove the option into admin screen
2013-05-14 09:24:05 +02:00
Laurent Destailleur
ee890a87a3
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/compta/prelevement/class/rejetprelevement.class.php
htdocs/compta/prelevement/ligne.php
htdocs/langs/en_US/admin.lang
2013-05-14 01:15:05 +02:00
Laurent Destailleur
d5cc106a3a
Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4
2013-05-14 01:04:10 +02:00
Laurent Destailleur
ea4b324e25
Merge pull request #943 from defrance69/patch-7
...
Update dolgraph.class.php
2013-05-13 15:41:36 -07:00
Laurent Destailleur
273fbdfa0e
Merge pull request #942 from FHenry/3.4
...
Remove warning if FetchObjectLinked call
2013-05-13 15:38:28 -07:00
Laurent Destailleur
03cbe6e208
Fix: Can't read link with some styles
2013-05-13 23:46:37 +02:00
fhenry
760ae88f39
[ task #531 ] Add a duration on tasks
2013-05-13 17:08:36 +02:00
Laurent Destailleur
df6c796413
Fix: [ bug #889 ] Titre civilité ne s'affiche
2013-05-12 17:09:48 +02:00
fhenry
111fc3153b
Fix Extrafield selllist bug in PgSQL
2013-05-12 15:45:23 +02:00
fhenry
aa7e3c2fdd
[ task #892 ] Add option in thridparty customer/supplier admin to hide
...
non active in select_company method
2013-05-11 17:10:11 +02:00
fhenry
ccb60e549a
Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4
2013-05-11 15:48:49 +02:00
Laurent Destailleur
6c4e47514d
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/holiday/fiche.php
2013-05-11 15:26:24 +02:00
Laurent Destailleur
711e7bf9ad
Merge remote-tracking branch 'origin/3.3' into 3.4
...
Conflicts:
htdocs/adherents/fiche.php
htdocs/core/lib/functions.lib.php
2013-05-11 15:18:52 +02:00
Laurent Destailleur
8a90598b23
Fix: Escape entities
2013-05-11 15:12:42 +02:00
Laurent Destailleur
526a80dd20
Sec: Param not escaped
...
Fix: Bad return error
2013-05-11 15:04:17 +02:00
Laurent Destailleur
fa4fc8495b
Fix: Missing translation key
...
Fix: Minor css style missing
Fix: Create draft proposal return error if no contact defined.
Fix: W3C
2013-05-11 02:12:34 +02:00
BENKE Charles
4f28c3dd41
Update dolgraph.class.php
...
jflot can't manage more than 2 bars but can manage more than 3 lines.
2013-05-11 00:13:27 +03:00
fhenry
1a7a8817be
Update wrong comment
2013-05-10 18:40:19 +02:00
fhenry
0d13b8d194
Fix previous bug
2013-05-10 18:35:19 +02:00
fhenry
4bb6bd8697
Order result fetchObjectLinked by sourcetype
2013-05-10 18:23:13 +02:00
fhenry
3a05d6c641
Remove warning if FetchObjectLinked call
2013-05-10 17:50:14 +02:00
fhenry
8542a4fd28
Fix date extrafield message old datetimeformat use message in log
2013-05-10 16:34:14 +02:00
Laurent Destailleur
9b30f116f1
Fix: Some lib missing when jmobile enabled.
2013-05-10 12:48:11 +02:00
Laurent Destailleur
ce6e1dc2a6
Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4
2013-05-09 23:35:04 +02:00
Laurent Destailleur
cc500cceba
Fix: form into table is not W3C (broken with some uncommon browsers).
2013-05-09 22:39:31 +02:00
Laurent Destailleur
28c4f9af61
Merge pull request #933 from FHenry/3.4
...
Make constraint SQL unique name (Mandatory for PgSQL)
2013-05-08 00:12:54 -07:00
Laurent Destailleur
68f3a634b6
Merge pull request #932 from marcosgdf/minor
...
Removed innecesary whitespace when no picto is displayed
2013-05-08 00:11:58 -07:00
fhenry
207f6cea28
Fix [ bug #883 ] Silent pgsql errors in comm/index.php
2013-05-07 16:59:27 +02:00
fhenry
16e06736e6
Fix bug [ bug #882 ] [3.4.0] Can't open WithdrawalReceipt / fichier de
...
prélèvement
2013-05-07 16:50:27 +02:00
Regis Houssin
8836b30a02
Fix: missing rename note to note_private and add note_public
2013-05-07 14:26:51 +02:00
Regis Houssin
6ec81375c4
Fix: missing rename note to note_private and add note_public
2013-05-07 14:26:11 +02:00
Laurent Destailleur
8a82c8c5d5
Merge remote-tracking branch 'origin/3.3' into 3.4
...
Conflicts:
htdocs/contact/class/contact.class.php
htdocs/margin/agentMargins.php
htdocs/margin/tabs/productMargins.php
2013-05-07 13:08:30 +02:00
simnandez
70dedc49b2
[ task #877 ] Reorganize menus. Works with auguria menu
2013-05-07 10:15:49 +02:00
Marcos García
c81cf6364a
Removed innecesary whitespace when no picto is displayed
2013-05-06 22:59:50 +02:00
Juanjo Menent
3bbde9b8e4
Merge pull request #918 from FHenry/develop
...
Fix margin calculation problem, and add myuser_fullname and myuser_logo
2013-05-06 07:01:38 -07:00
fhenry
bdb81803bd
Merge branch '3.3' of https://github.com/Dolibarr/dolibarr.git into 3.3
2013-05-04 09:06:32 +02:00
simnandez
15ede98fe7
New: [ task #877 ] Reorganize menus. Init works
...
Add migration script 3.4 to 3.5
2013-05-04 01:22:09 +02:00
fhenry
95e4474906
Fix bug on PgSQL if user in on another entity than 1
2013-05-03 20:56:58 +02:00
Laurent Destailleur
1c9caeb0d3
Fix: CRLF
2013-05-03 18:33:23 +02:00
Laurent Destailleur
0b228b3a87
Merge remote-tracking branch 'origin/3.3' into 3.4
...
Conflicts:
htdocs/user/perms.php
2013-05-03 18:33:05 +02:00
Laurent Destailleur
c8ef07a889
Merge branch '3.3' of https://github.com/Dolibarr/dolibarr.git into 3.3
2013-05-03 16:14:27 +02:00
Laurent Destailleur
723bd6f750
Fix: [ bug #872 ] Erreur sur page Accueil Commerciale avec pgsql
...
(3.4-beta).
Fix: Permission tab was not visible for external users.
2013-05-03 16:10:28 +02:00
fhenry
d8f1818f86
Fix margin calculation problem, and add myuser_fullname and myuser_logo
...
into standard ODT replacement
2013-05-03 15:44:35 +02:00
Laurent Destailleur
b7f3f07fc7
Fix: [ bug #840 ] fichetwothirdright 65% to 55%
2013-05-03 12:13:10 +02:00
Laurent Destailleur
880daa4375
Fix: log file permission during install
2013-05-03 11:51:26 +02:00
Laurent Destailleur
c17cd04686
Merge pull request #904 from defrance69/patch-5
...
Update modSociete.class.php
2013-05-03 01:09:37 -07:00
Laurent Destailleur
776655d8c6
Merge pull request #903 from defrance69/patch-4
...
Update modProduct.class.php
2013-05-03 01:09:29 -07:00
Laurent Destailleur
2e4c73ebc4
Fix: Link to phone with tel: must be only onto terminal that support
...
protocol "tel:"
2013-05-03 10:06:54 +02:00
Laurent Destailleur
fc0d5abd14
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
ChangeLog
htdocs/compta/prelevement/bons.php
htdocs/compta/prelevement/fiche-stat.php
htdocs/contact/class/contact.class.php
htdocs/contrat/class/contrat.class.php
htdocs/core/menus/standard/eldy.lib.php
htdocs/core/modules/modSociete.class.php
htdocs/projet/fiche.php
test/phpunit/FilesLibTest.php
2013-05-03 00:15:02 +02:00
fhenry
0dbc73a6cc
Change-Id: Ie16265e57fa29748fa6c8a1e15ac15ff70786d1d
2013-05-02 22:57:42 +02:00
Laurent Destailleur
77956a5676
Merge pull request #911 from atm-maxime/develop
...
Fix : extrafields were save without escape
2013-05-02 10:43:14 -07:00
Laurent Destailleur
f595a7ed0c
Merge pull request #905 from FHenry/develop
...
Add table extrafield for commande fournisseur
2013-05-02 10:41:02 -07:00
Laurent Destailleur
9a4cc839bb
Fix: Removed warning
...
Fix: Parameters are lost
Fix: Hedaer of demo no complete
Fix: Get of country is not complete (bad label)
2013-05-02 17:41:10 +02:00
Laurent Destailleur
26f3e920cf
Fix: Removed warning.
...
Fix: Missing doxygen
2013-05-02 13:10:39 +02:00
Maxime Kohlhaas
80cf467c47
Fix : extrafields were save without escape
2013-05-02 12:14:29 +02:00
fhenry
5d60ed2462
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-05-01 22:57:33 +02:00
fhenry
3b6efd569d
Fix bug [ bug #861 ] Erreur de droit groupe et utilisateur
2013-05-01 17:09:08 +02:00
Laurent Destailleur
5c95018356
Fix: Avoid empty arrays
2013-05-01 16:00:06 +02:00
fhenry
f3480bf502
Merge branch '3.3' of https://github.com/Dolibarr/dolibarr.git into 3.3
2013-05-01 14:38:43 +02:00
Laurent Destailleur
0a71c84bf4
Fix: Remove separator files.
2013-04-30 23:08:07 +02:00
Laurent Destailleur
7d71be2227
Fix: Import of contact/address not complete and not working with pgsql
...
Conflicts:
htdocs/core/modules/modSociete.class.php
2013-04-30 22:56:52 +02:00
Laurent Destailleur
c84427bd22
Fix: delete of files with [ and glob.
...
Conflicts:
test/phpunit/FilesLibTest.php
2013-04-30 22:52:56 +02:00
Laurent Destailleur
786bf9d035
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-04-30 22:39:17 +02:00
fhenry
ac6e56f058
Fix bug [ bug #861 ] Erreur de droit groupe et utilisateur
2013-04-30 21:10:26 +02:00
Laurent Destailleur
8c064c4883
Fix: Import of contact/address not complete and not working with pgsql
2013-04-30 19:02:02 +02:00
Laurent Destailleur
761b2d05d4
Fix: delete of files with [ and glob.
2013-04-30 17:24:11 +02:00
BENKE Charles
b1784ff247
Update modSociete.class.php
...
add filter feature on extrafields
2013-04-30 13:15:02 +03:00
BENKE Charles
3f6216e6d0
Update modProduct.class.php
...
Add filtering feature on extrafields
2013-04-30 13:12:54 +03:00
Laurent Destailleur
840dcfec38
Fix: Bad detection of PDF format.
2013-04-29 09:25:42 +02:00
Laurent Destailleur
f6c2bd4928
Fix: Uniformize menu conditions
2013-04-28 23:25:28 +02:00
Grand Philippe
63c474e2cc
fix: Undefined index
2013-04-28 22:29:50 +02:00
Grand Philippe
c4a064d104
fix: Undefined property: mod_codeclient_monkey::$prefixIsRequired
2013-04-28 19:35:10 +02:00
Laurent Destailleur
670d01e14e
Fix: Remove space char at end of document and viewimage.
2013-04-28 18:46:34 +02:00
Laurent Destailleur
80e470a4ce
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/compta/facture.php
htdocs/compta/facture/impayees.php
htdocs/compta/index.php
htdocs/core/boxes/box_produits_alerte_stock.php
htdocs/core/class/html.form.class.php
htdocs/core/modules/syslog/mod_syslog_file.php
htdocs/fourn/facture/impayees.php
htdocs/holiday/class/holiday.class.php
htdocs/holiday/fiche.php
2013-04-28 01:24:58 +02:00
Laurent Destailleur
7b85baa5e4
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-04-28 01:12:48 +02:00
Laurent Destailleur
2e81fa342e
Uniformize code, order of fiels in card and language files.
2013-04-28 01:12:40 +02:00
Laurent Destailleur
4c9a728799
Merge pull request #890 from marcosgdf/translations
...
Improved translations
2013-04-27 12:53:15 -07:00
Laurent Destailleur
07baa244ed
No need to make a test on a var
2013-04-27 21:38:49 +02:00
Laurent Destailleur
38bc86dc2a
Missing menu entry for home page
2013-04-27 21:37:30 +02:00
Laurent Destailleur
e29f533b7a
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/comm/propal/class/propal.class.php
2013-04-27 15:15:31 +02:00
Laurent Destailleur
52952c6fce
Uniformize code for liste_array
...
Fix visibility of elements into product page (manage external users)
2013-04-27 15:08:35 +02:00
Marcos García
36574771a6
Translation of barcode internal engine string
2013-04-27 12:49:19 +02:00
Laurent Destailleur
24309a7f17
Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3
2013-04-27 12:25:22 +02:00
Laurent Destailleur
3203283fe9
Fix: remove warning
2013-04-27 12:24:48 +02:00
Laurent Destailleur
50dd0ef7ee
Merge pull request #885 from FHenry/develop
...
Review extrafield for compliance with wiki
2013-04-26 13:08:37 -07:00
Laurent Destailleur
0a282c018a
Merge pull request #886 from jfefe/doc_ods
...
Using of MAIN_DOC_USE_TIMING on ODT
2013-04-26 13:04:08 -07:00
fhenry
91885a8bd4
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-04-26 20:54:53 +02:00
Laurent Destailleur
162cb4ffea
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-04-26 19:17:51 +02:00
Laurent Destailleur
2a74cb81f0
Fix: Removed warnings
2013-04-26 19:13:39 +02:00
Regis Houssin
d25687276e
Fix: bypass the second test if the first is ok
2013-04-26 16:29:29 +02:00
Regis Houssin
c0a3271d76
Fix: bypass the second test if the first is ok
2013-04-26 16:28:54 +02:00
Regis Houssin
c969d17e48
Fix: avoid error
2013-04-26 16:22:14 +02:00
Regis Houssin
3684271627
Fix: avoid error
2013-04-26 16:21:48 +02:00
Regis Houssin
36e6269b24
Fix: big security problem with multicompany
2013-04-26 16:08:02 +02:00
Regis Houssin
34036c2a5c
Fix: big security problem with multicompany
2013-04-26 16:07:35 +02:00
fhenry
c988944f1a
PDF admin : Add option to hide num TVA intra into adress of customer
2013-04-26 13:25:51 +02:00
fhenry
30ad2f1609
Fix bug in fetch_optionals
2013-04-26 10:51:17 +02:00
fhenry
a06581771c
Reveiw extrafield for womplaiance with wiki
...
http://wiki.dolibarr.org/index.php/Extrafields
2013-04-26 10:29:14 +02:00
jfefe
8835868749
Implement MAIN_DOC_USE_TIMING into project and order ODT
2013-04-26 08:48:44 +02:00
jfefe
8a958c31e3
Use MAIN_DOC_USE_TIMING on invoices (odt)
2013-04-26 08:48:44 +02:00
jfefe
036e81a089
Use MAIN_DOC_USE_TIMING on proposals (ODT)
2013-04-26 08:48:44 +02:00
jfefe
bfc15fb99f
Change name of hidden option to add timing in filename (MAIN_DOC_USE_TIMING)
2013-04-26 08:48:43 +02:00
fhenry
d0f44bf25f
Add zero entity into extrafeild deletion
2013-04-26 08:46:25 +02:00
Laurent Destailleur
271dcf578f
Fix: Better error message during import of csv with records split onto
...
several lines.
2013-04-25 23:49:24 +02:00
Laurent Destailleur
36b314a2d6
Try to solve some problems with table (replaced by div).
2013-04-25 20:27:45 +02:00
Laurent Destailleur
726c83d2d2
Merge pull request #877 from FHenry/develop
...
Fix bug on Extrafield list table type
2013-04-25 01:23:57 -07:00
Laurent Destailleur
023b6f2e8b
Fix: Use entity
2013-04-25 10:22:08 +02:00
Laurent Destailleur
86ea79c860
Fix: dol_check_secure_access_document is also used by viewimage. This
...
also solve bug of not found supplier doc and solve some security holes.
2013-04-25 10:06:54 +02:00
Laurent Destailleur
cce857d6ee
Fix: When box is removed, it is added into combo box of available boxes.
2013-04-25 01:35:33 +02:00
Laurent Destailleur
4e0ef01389
Qual: nowrap="nowrap" is replaced with a CSS class style .nowrap
2013-04-25 01:13:13 +02:00
fhenry
8c440b3f57
Remove entity check in list table extrafield
2013-04-25 00:14:43 +02:00
fhenry
507da4fc3b
Add Zero entity to shared extrafield
2013-04-25 00:09:47 +02:00
fhenry
f1a97d4705
remove ver_export
2013-04-25 00:02:29 +02:00
fhenry
9a0f9477a6
Fix multicompany problem with extrafield list from table
2013-04-25 00:01:38 +02:00
fhenry
7fdf2f3482
Fix for php 5
2013-04-24 23:54:02 +02:00
fhenry
928a1afe18
Fix bug on Extrafield list table type
2013-04-24 21:32:22 +02:00
Laurent Destailleur
3896b99bad
Add UK with GB.
2013-04-24 19:14:59 +02:00
fhenry
7b1616d0c5
Better management extrafield from list of table
2013-04-24 19:14:03 +02:00
fhenry
5789a5d6e9
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-04-24 17:53:59 +02:00
simnandez
436b6259c0
Fix: finish merge
2013-04-24 16:57:46 +02:00
fhenry
9ce7e44f00
use price method rather than price2num. price are use in all PDF, so it
...
should be the same on ODT
2013-04-24 16:47:15 +02:00
Laurent Destailleur
9a2b72f8f8
Compatibility with jmobile
2013-04-24 15:49:43 +02:00
fhenry
41c8a9aa6a
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-04-24 15:07:03 +02:00
Laurent Destailleur
bca399623f
Fix: finish merge
2013-04-24 12:44:36 +02:00
fhenry
d9a2805100
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-04-24 08:50:51 +02:00
Laurent Destailleur
d5f3f47782
New: Use div for tabs.
2013-04-24 03:56:13 +02:00
fhenry
bd1b440743
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-04-23 23:28:44 +02:00
Laurent Destailleur
854b9df96d
Qual: Clean code of box management
2013-04-23 16:18:26 +02:00
Laurent Destailleur
7dce8d2306
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
build/debian/changelog
build/doxygen/dolibarr-doxygen.doxyfile
build/exe/doliwamp/doliwamp.iss
build/launchpad/README
build/makepack-dolibarr.pl
build/perl/virtualmin/dolibarr.pl
build/rpm/dolibarr_fedora.spec
build/rpm/dolibarr_generic.spec
build/rpm/dolibarr_mandriva.spec
build/rpm/dolibarr_opensuse.spec
htdocs/core/modules/syslog/mod_syslog_file.php
htdocs/filefunc.inc.php
htdocs/product/class/product.class.php
2013-04-23 14:04:56 +02:00
fhenry
ba0e9c0c19
Fix [ bug #843 ] Erreur SQL box_stock
...
fix [ bug #842 ] Erreur SQL Propal
2013-04-23 14:02:29 +02:00
Laurent Destailleur
3f1f065d4e
Fix: log must use the mask defined into setup
...
Conflicts:
htdocs/core/modules/syslog/mod_syslog_file.php
2013-04-23 12:02:56 +02:00
Laurent Destailleur
78a0c7ace2
Fix: log must use the mask defined into setup
2013-04-23 12:00:02 +02:00
Laurent Destailleur
c8b2ce3d8e
Removed warning
2013-04-22 20:46:53 +02:00
Laurent Destailleur
494e9dbe18
Removed warning
2013-04-22 20:45:47 +02:00
Laurent Destailleur
9135fd0272
Merge pull request #868 from jfefe/webservices
...
New webservice to retrieve a document (work on invoice, propal, order and generic
2013-04-22 11:35:35 -07:00
Laurent Destailleur
2c4515f40e
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-04-22 20:00:01 +02:00
Laurent Destailleur
5d74f228d8
Removed version into trigger page (version on trigger is useless since
...
trigger depend on module. Only version of module is required).
2013-04-22 19:59:41 +02:00
simnandez
de5a57a3c8
Fix: Uniformize creation in orders
2013-04-22 16:23:59 +02:00
fhenry
3fdc57cc56
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-04-22 16:20:35 +02:00
fhenry
ee4839c92e
Better management for ODT to PDF
2013-04-22 15:50:26 +02:00
Regis Houssin
7217d91f13
Fix: missing commit
2013-04-22 15:26:45 +02:00
Regis Houssin
28757c8d88
Fix: missing commit
2013-04-22 15:26:14 +02:00
Regis Houssin
ccf809b14a
Fix: broken features
2013-04-22 15:10:15 +02:00
Regis Houssin
29a8c10504
Fix: broken features
2013-04-22 15:09:19 +02:00
jfefe
b5e66cc492
Mutualize code for security check when accessing a document by document.php and bywebservice
2013-04-22 15:00:29 +02:00
Regis Houssin
1be6a2c120
Fix: broken features for fileupload
2013-04-22 14:39:25 +02:00
Regis Houssin
63a5aee80e
Fix: broken features for fileupload
2013-04-22 14:37:18 +02:00
Laurent Destailleur
e65e6516c5
Fix: Logon theme on amarok
2013-04-22 14:33:47 +02:00
Laurent Destailleur
54040bed1d
Fix: No slash alone
2013-04-22 12:48:56 +02:00
Laurent Destailleur
5cbb0359aa
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-04-22 10:33:46 +02:00
Laurent Destailleur
ee843924dd
Fix: Some translation change to have things more clear.
2013-04-22 10:33:06 +02:00
Regis Houssin
ab4a3dcaa7
Fix: missing rename field
2013-04-22 10:18:03 +02:00
Laurent Destailleur
89ad634230
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
htdocs/compta/facture/class/facture.class.php
htdocs/core/class/hookmanager.class.php
htdocs/langs/fr_FR/holiday.lang
2013-04-22 01:39:49 +02:00
Laurent Destailleur
9b07271460
Merge pull request #864 from jfefe/doc_ods
...
Task [#838 ] : Can generate ods document on thirdparty
2013-04-21 16:32:07 -07:00
Laurent Destailleur
11023fa210
Merge pull request #857 from marcosgdf/task-823
...
New: [ task #823 ] Shipping_validate email notification
2013-04-21 16:07:37 -07:00
Laurent Destailleur
e19e0ff557
Fix: Error management
2013-04-22 00:57:56 +02:00
Laurent Destailleur
3f09cbec7e
Merge pull request #855 from marcosgdf/minor-refactor
...
ECM Refactor
2013-04-21 15:18:15 -07:00
Laurent Destailleur
9f3164d710
Merge pull request #849 from GPCsolutions/ca_report_improvments
...
Improved reports
2013-04-21 15:13:34 -07:00
Laurent Destailleur
42b3d6e317
Merge pull request #865 from FHenry/develop
...
Add extrafield select from table
2013-04-21 15:12:04 -07:00
Laurent Destailleur
5893fadb58
Look: Minor style enhancement
2013-04-21 17:56:29 +02:00
fhenry
d6514e1cd6
Add extrafield select from table
2013-04-21 17:36:23 +02:00
JF FERRY
642ba10d84
New hidden option to introduce timing value into odt document nam
2013-04-21 17:04:54 +02:00
Laurent Destailleur
f4513d1beb
Move option ate better place
2013-04-21 16:01:36 +02:00
JF FERRY
83028b958a
Task #838 : retieve extension to work with ods document
2013-04-21 15:12:48 +02:00
JF FERRY
fcf1eeba20
Task #838 - change regex to look at ods document too
2013-04-21 14:55:32 +02:00
Marcos García
82e3a8d0b9
New: [ task #823 ] Shipping_validate email notification
2013-04-21 14:14:30 +02:00
Marcos García
293fc89a9f
Missing copyright
2013-04-21 12:45:34 +02:00
Marcos García
17902a8455
Removed var_dump
2013-04-21 12:44:13 +02:00
Marcos García
7befeae371
ECM Refactor
2013-04-21 12:42:58 +02:00
Laurent Destailleur
ab2709f684
Filter on agenda event are autoselected on "manual event".
2013-04-21 12:26:44 +02:00
Laurent Destailleur
a7f169d102
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-04-20 23:43:19 +02:00
Laurent Destailleur
c282ff91d6
Fix: pgsql compatibility
2013-04-20 23:43:02 +02:00
Laurent Destailleur
9c11b6a246
Merge pull request #851 from FHenry/develop
...
Add hidden option MAIN_ODT_AS_PDF to save ODT as PDF
2013-04-20 12:02:16 -07:00
Laurent Destailleur
12caa20e38
Merge pull request #850 from atm-maxime/develop
...
Carrier conf modification
2013-04-20 11:42:44 -07:00
Laurent Destailleur
4d54b8a22f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-04-20 20:30:48 +02:00
Laurent Destailleur
dd13c334c7
New: Compatibility with jmobile
2013-04-20 20:30:18 +02:00
Laurent Destailleur
2008fd1419
Fix: Optimize for small screen
2013-04-20 17:49:24 +02:00
fhenry
dd8a84bce3
Fix [ bug #833 ] Accounting journals are broken
2013-04-20 13:08:06 +02:00
Maxime Kohlhaas
cf945f0187
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
2013-04-20 13:00:33 +02:00
fhenry
413ee7ec78
Add hidden option MAIN_ODT_AS_PDF to save ODT as PDF (only if
...
libreoffice/jodconverter/exec shell right)
2013-04-20 10:44:01 +02:00
Raphaël Doursenaud
f2bd1461b2
Improved reports
...
Added amount without VAT for "CREANCES-DETTES" mode
Added turnover by products/services
Added categories filter for users and products/services
Added period management
Added list sorting
2013-04-20 07:33:10 +02:00
fhenry
62c9366d69
fix debug
2013-04-20 07:21:26 +02:00
fhenry
75194ddb57
Ifo user visibility and maxlength product label regarding db column size
2013-04-20 07:05:31 +02:00
Laurent Destailleur
162ccf68b6
Merge pull request #841 from FHenry/develop
...
fix [ bug #825 ] User first name not visible into users->perms
2013-04-19 17:21:16 -07:00
fhenry
e2d0d0d414
Fix fix as Eldy wish it
2013-04-20 00:10:20 +02:00
Maxime Kohlhaas
bfb05c78cd
Change carrier config into dict instead of dedicated conf page
2013-04-19 20:20:10 +02:00
unknown
8030b39536
fix : undefined variable
2013-04-19 19:45:06 +02:00
Laurent Destailleur
eebbcbec57
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-04-19 19:18:39 +02:00
Laurent Destailleur
bb3f40a1bf
Qual: Clean code to be able to update combo box when removing a box.
...
Qual: Opensurvey tables
2013-04-19 15:26:53 +02:00
Laurent Destailleur
08ae1d289b
Pgsql compatibility
2013-04-19 15:02:53 +02:00
Laurent Destailleur
570e4391a5
Fix: Box with product out of stocks for pgsql
2013-04-19 14:51:39 +02:00
Regis Houssin
5d7b94f661
Fix: the purchase price, manually entered is not taken recovered
2013-04-19 13:30:08 +02:00
Regis Houssin
077698d789
Fix: for avoid missing the customer discount
2013-04-19 12:47:53 +02:00
Laurent Destailleur
df0b0ebf51
Fix: Uniformize pdf code for typhon. This should also solve problem
...
of overlapped text into delivery receipts.
Conflicts:
htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
2013-04-19 09:52:25 +02:00
Laurent Destailleur
5c1b3d86c3
Fix: Uniformize pdf code for typhon. This should also solve problem
...
of overlapped text into delivery receipts.
2013-04-19 09:44:37 +02:00
Laurent Destailleur
ac8868e2d2
Fix: Use correct format for js
2013-04-18 19:56:14 +02:00
Laurent Destailleur
a880a8c51e
Qual: Work to prepare usage of jquery data plugins.
2013-04-18 19:37:50 +02:00
Regis Houssin
ebb09db710
Fix: for avoid errors
2013-04-18 11:05:31 +02:00
Juanjo Menent
fa4490ef79
Merge pull request #840 from FHenry/develop
...
[ task #741 ] Gestion des interventions/Add intervention box
2013-04-17 07:59:34 -07:00
Laurent Destailleur
bcacbab481
Qual: No need to use two menu entries for this.
2013-04-17 16:26:14 +02:00
fhenry
4927aae891
[ task #741 ] Gestion des interventions/Add intervention box
2013-04-17 16:20:01 +02:00
Laurent Destailleur
a5deb8e9d7
Fix: bug into is_erasable function.
...
Conflicts:
test/phpunit/NumberingModulesTest.php
2013-04-16 15:54:36 +02:00
Laurent Destailleur
4fe49b6736
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-04-16 15:01:07 +02:00
Laurent Destailleur
248de05196
Fix: bug into is_erasable function.
2013-04-16 15:00:41 +02:00
fhenry
cba73b238c
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/comm/propal.php
Change-Id: I5639c70165c8e1149f3934248737817a02efff0c
2013-04-16 11:37:51 +02:00
Laurent Destailleur
9659ecba70
Merge pull request #836 from jfefe/extrafields
...
Fix on extrafields date type : do not show current date when field not r...
2013-04-16 02:33:01 -07:00
Laurent Destailleur
10ab1a583a
Look: Optimize screens
2013-04-16 01:13:20 +02:00
Laurent Destailleur
51fe0d9e09
Removed duplicate function
2013-04-15 22:26:03 +02:00
jfefe
610fed6b3c
Fix on extrafields date type : do not show current date when field not required
2013-04-15 18:42:00 +02:00
Laurent Destailleur
37e54b3d80
Qual: Update copyright files.
...
Qual: Removed not used library.
Look: Uniformize css.
2013-04-15 18:00:20 +02:00
Laurent Destailleur
8e1c06f617
Qual: Cleaner menu sources
2013-04-15 15:56:50 +02:00
fhenry
24a6321d45
Fix : Add service date limit transfert from propal to order
2013-04-15 15:55:10 +02:00
Laurent Destailleur
de2ddc02e4
Qual: Another clean of menu management system. Removed all files
...
pre.inc.php
2013-04-15 13:11:29 +02:00
Laurent Destailleur
36c55971b5
Fix: PHPUnit Regression
2013-04-14 23:57:07 +02:00
Laurent Destailleur
67052933ca
Fix: PHPUnit
2013-04-14 23:42:24 +02:00
Laurent Destailleur
a0851ba99f
More complete log.
2013-04-14 18:10:02 +02:00
Laurent Destailleur
e4c4cced70
Look: Optimize for small screen
2013-04-14 16:11:55 +02:00
Laurent Destailleur
a5d996de4c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-04-14 14:45:43 +02:00
Laurent Destailleur
f8c3396fa7
Fix: "Now" button was not working when using combo calendar selector.
2013-04-14 14:45:23 +02:00
Laurent Destailleur
22402c38f8
Still working on new menu management.
2013-04-14 14:32:38 +02:00
Juanjo Menent
de19af9e9f
Merge pull request #825 from FHenry/develop
...
[ task #814 ] Add extrafield feature into Project/project tasks module
2013-04-14 05:15:17 -07:00
Laurent Destailleur
3cec5bfc40
doxygen
2013-04-14 11:22:00 +02:00
Laurent Destailleur
b86eba7f34
doxygen
2013-04-14 10:50:33 +02:00
fhenry
00fb40e073
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/langs/ca_ES/admin.lang
htdocs/langs/es_ES/admin.lang
Change-Id: I3c2c0789a92fb3d5506c717986ce0127dec75b9b
2013-04-14 09:40:01 +02:00
Laurent Destailleur
51f444fb8c
Look: Optimize title lines
2013-04-14 02:09:41 +02:00
Laurent Destailleur
e5a945ba5b
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
ChangeLog
htdocs/admin/propal.php
htdocs/compta/journal/purchasesjournal.php
htdocs/compta/journal/sellsjournal.php
htdocs/core/class/conf.class.php
htdocs/core/class/hookmanager.class.php
htdocs/core/lib/files.lib.php
htdocs/core/modules/mailings/contacts2.modules.php
htdocs/langs/ca_ES/admin.lang
htdocs/langs/en_US/admin.lang
htdocs/langs/es_ES/admin.lang
htdocs/langs/fr_FR/admin.lang
htdocs/public/demo/index.php
2013-04-14 01:46:33 +02:00
Laurent Destailleur
38cb9a530f
Doxygen
2013-04-14 01:28:43 +02:00
Laurent Destailleur
bda39f25bf
New: Default aprrover for holidays i sby default hierchical parent.
2013-04-14 01:04:11 +02:00
Laurent Destailleur
fc22489104
Fix: Option SOCIETE_DISABLE_CUSTOMERS not complete
2013-04-13 21:18:41 +02:00
Laurent Destailleur
355168527d
Look: Optimize for smartphone
2013-04-13 18:41:43 +02:00
Laurent Destailleur
1a1e09a5ed
Qual: Clean and mutualize code.
2013-04-13 18:33:23 +02:00
Laurent Destailleur
20c9370690
New: Support the mode readonly of ckeditor
2013-04-13 16:23:05 +02:00
Laurent Destailleur
6e495bfbe1
Fix: lang loading
2013-04-13 14:38:26 +02:00
Laurent Destailleur
90cfa42915
Fix: removed useless
2013-04-12 19:45:09 +02:00
Laurent Destailleur
62893c2ae4
Qual: uniformize code to use function de set with and height for graphs
2013-04-12 17:08:54 +02:00
Laurent Destailleur
26653a42e4
Optimize for terminal with no_mouse_hover
2013-04-12 16:53:06 +02:00
Laurent Destailleur
97b0076c5a
Doxygen
2013-04-12 16:31:16 +02:00
Laurent Destailleur
ae01285fe9
Look: Replace table with div.
...
Look: Optimize for smartphone
2013-04-12 16:16:39 +02:00
Laurent Destailleur
3238a22afd
Fix: Do not show not defined entries
2013-04-12 14:46:48 +02:00
Laurent Destailleur
c9b3193c44
Fix: Hooks with version 3.4 must match specification defined here:
...
http://wiki.dolibarr.org/index.php/Hooks_system
So i try a better fix that implement correctly this. To have the
moveFileUpload trigger keeping dolibarr code, it must return 0.
2013-04-12 13:18:24 +02:00
fhenry
cc497490eb
[ task #814 ] Add extrafield feature into Project/project tasks module
2013-04-12 11:09:53 +02:00
Regis Houssin
9596134e47
Fix: use new method
2013-04-12 10:28:19 +02:00
Regis Houssin
0b2b888584
Fix: use new method
2013-04-12 10:26:52 +02:00
Regis Houssin
85e09a953f
Fix: missing return with hook
2013-04-12 10:04:10 +02:00
Regis Houssin
3892a52852
Fix: missing return with hook
2013-04-12 10:00:20 +02:00
Laurent Destailleur
8e3f0172fc
Fix: Fix tons of pb with num ref system of supplier invoices.
2013-04-12 00:00:31 +02:00
Laurent Destailleur
fe20f8ae1b
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/install/mysql/migration/3.3.0-3.4.0.sql
htdocs/install/mysql/tables/llx_expedition.key.sql
htdocs/install/mysql/tables/llx_expedition.sql
2013-04-11 23:08:10 +02:00
Laurent Destailleur
edcc201305
Fix: not complete renaming
2013-04-11 23:04:25 +02:00
Laurent Destailleur
4876aee493
Fix: Fix bad fix of SOCIETE_CODEFOURNISSEUR_ADDON
2013-04-11 20:32:09 +02:00
Laurent Destailleur
616219c99c
Merge pull request #822 from FHenry/develop
...
Qual : PHP Code_Sniffer
2013-04-11 10:14:03 -07:00
fhenry
629ef78dc8
Add subtitution inside header and fotter document
2013-04-11 18:38:50 +02:00
fhenry
2f7be8d2c2
Add hook for substitution
2013-04-11 17:31:24 +02:00
Regis Houssin
662d9cfa6e
Fix: for avoid problem with multicompany thirdparty sharing
2013-04-11 17:11:15 +02:00
Regis Houssin
9b2cbfef05
Fix: for avoid problem with multicompany thirdparty sharing
2013-04-11 17:10:11 +02:00
fhenry
6335918d72
Quel : indentation
2013-04-11 17:06:53 +02:00
fhenry
2440513007
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
htdocs/fourn/class/fournisseur.product.class.php
htdocs/opensurvey/fonctions.php
htdocs/opensurvey/public/choix_date.php
htdocs/opensurvey/public/create_survey.php
htdocs/opensurvey/public/exportcsv.php
htdocs/public/paybox/paymentko.php
Change-Id: I57468f3a0f6bb1115bd48b84517060432102c2ea
2013-04-11 10:04:27 +02:00
Laurent Destailleur
792341a4b8
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
2013-04-11 07:39:16 +02:00
BENKE Charles
e0cb09bd65
Update admin_extrafields.inc.php
...
$default_value not initialised
new type : sellist
2013-04-10 22:38:45 +03:00
Laurent Destailleur
4d0dd0d56c
Fix: Function to generate pdf
2013-04-10 20:50:05 +02:00
Laurent Destailleur
9dd201df10
Fix: Log
2013-04-10 20:47:39 +02:00
Laurent Destailleur
15e86875f3
Fix: sql syntax error
2013-04-10 20:45:38 +02:00
fhenry
98ddd02a32
Qual : PHP Code_Sniffer
2013-04-10 19:55:21 +02:00
Laurent Destailleur
70b7cb1fa3
Fix: Restore suffix
2013-04-10 19:50:54 +02:00
Laurent Destailleur
a32a02e4c1
Fix: Removed warnings
2013-04-10 16:51:13 +02:00
Laurent Destailleur
d7c0cf3d50
Fix: More complete fix for emailing contact selectors.
2013-04-10 16:29:53 +02:00
Regis Houssin
19e902ef8f
Fix: filter on all contacts, not just those related to a company
2013-04-10 16:00:30 +02:00
Regis Houssin
740bc2a656
Fix: filter on all contacts, not just those related to a company
2013-04-10 15:59:54 +02:00
Regis Houssin
8118332dfb
Fix: security
...
Conflicts:
htdocs/core/modules/mailings/contacts2.modules.php
2013-04-10 13:00:05 +02:00
Laurent Destailleur
ba93a4bfe2
Fix: Codesniffer
2013-04-10 12:20:45 +02:00
Regis Houssin
2c51b51a88
Fix: security
2013-04-10 11:56:19 +02:00
Laurent Destailleur
bc1469ff29
Fix: More complete function
2013-04-10 11:03:24 +02:00
Laurent Destailleur
b496436fe3
Qual: Reduce number of methods. Mutualize update_note code.
2013-04-10 10:58:38 +02:00
Laurent Destailleur
7f6fa0bf0f
Fix: Enhance detection of html
2013-04-10 10:40:35 +02:00
Laurent Destailleur
e79d0f50d0
Fix: Regression
2013-04-10 00:08:55 +02:00
Laurent Destailleur
538194f435
New: Add module opensurvey. Final. Test are welcome.
2013-04-09 23:05:50 +02:00
Laurent Destailleur
2ab5c2029d
Merge pull request #817 from grandoc/develop
...
add supplier invoice extrafields and some fixes
2013-04-09 12:21:26 -07:00
frederic34
61b4305949
Merge remote-tracking branch 'upstream/develop' into develop
2013-04-09 17:33:09 +02:00
fhenry
275bf67bb7
[ task #811 ] Uniformanize note field
2013-04-09 17:18:07 +02:00
Grand Philippe
f4e58d71ed
add supplier invoice extrafields and some fixes
2013-04-09 09:38:25 +02:00
Laurent Destailleur
328801f455
Hide upload on smartphones
2013-04-09 01:27:41 +02:00
Laurent Destailleur
bba123c6ef
Merge pull request #815 from FHenry/develop
...
Fix bug on ODT template path for order and projects
2013-04-08 14:27:28 -07:00
Laurent Destailleur
898a3891e8
Merge pull request #814 from grandoc/develop
...
fix: wrong url
2013-04-08 14:26:15 -07:00
Grand Philippe
5b5b57d4e0
some fixes for supplier orders extrafields
2013-04-08 23:20:35 +02:00
Laurent Destailleur
7d2b11aff5
Qual: Remove a deprecated page, replaced by a more direct combo box.
2013-04-08 19:26:45 +02:00
fhenry
6379b74099
Fix bug on ODT template path for order and projects
2013-04-08 18:02:12 +02:00
Grand Philippe
e54056b805
prepair for insert ExtraFields
2013-04-08 17:39:32 +02:00
Grand Philippe
e21e08717e
normalize code
2013-04-08 16:06:57 +02:00
Grand Philippe
a593e5d4e5
fix: wrong url
2013-04-08 11:56:50 +02:00
frederic34
40f11206de
Merge remote-tracking branch 'upstream/develop' into develop
...
Conflicts:
htdocs/commande/fiche.php
2013-04-08 11:33:45 +02:00
fhenry
52706117d9
Merge branch 'develop' into develop_orderextrafield
2013-04-07 23:54:33 +02:00
fhenry
393007625a
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/install/mysql/migration/3.3.0-3.4.0.sql
Change-Id: I9df271d1629014299e7db131a66c1322aa897f6d
2013-04-07 23:52:02 +02:00
Laurent Destailleur
b678183ff2
Log
2013-04-07 21:09:57 +02:00
Laurent Destailleur
5c3e6de073
Qual: Mutualize code. Only one function to build address format.
2013-04-07 17:39:08 +02:00
fhenry
78571e4458
Merge branch 'develop' into develop_orderextrafield
2013-04-07 15:12:27 +02:00
fhenry
0427080a4e
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_orderextrafield
Conflicts:
htdocs/install/mysql/migration/3.3.0-3.4.0.sql
Change-Id: I91fe24831dca9e1d9e6b09f85dd4b7bd37bd638e
2013-04-07 15:11:52 +02:00
fhenry
144ab24545
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/install/mysql/migration/3.3.0-3.4.0.sql
Change-Id: I51b110ec2c087110ab6080d1e754438ce83bd9cd
2013-04-07 15:08:47 +02:00
Laurent Destailleur
64a9689473
Fix: [ bug #787 ] Invoice supplier box incorrect tooltip when delay on
...
payment
2013-04-07 14:41:42 +02:00
Laurent Destailleur
fafd426903
Fix: [ bug #787 ] Invoice supplier box incorrect tooltip when delay on
...
payment
2013-04-07 14:40:13 +02:00
Marcos García
6252857440
Fixed translations and BILL_SUPPLIER_BUILDDOC trigger
2013-04-06 17:56:10 +02:00
Laurent Destailleur
ee2a2f7b48
Missing space
2013-04-06 16:43:26 +02:00
fhenry
2b0668bf81
Add paiement mode et delay on PDF muscadet
2013-04-06 13:38:32 +02:00
fhenry
9ff559b033
Add wished delivery date into supplier orders PDF muscadet
2013-04-06 13:06:26 +02:00
fhenry
0aba3cfc05
Fix order_supplier and invoice_supplier PDF model name
2013-04-06 13:00:41 +02:00
fhenry
cc465380da
Fix upgrade bug (llx_printer_ipp) wrong syntax (my fault, sorry)
2013-04-06 12:20:19 +02:00
fhenry
b7137606ee
Merge branch 'develop' into develop_orderextrafield
...
Conflicts:
htdocs/commande/fiche.php
htdocs/install/mysql/migration/3.3.0-3.4.0.sql
Change-Id: If57a2f2a386a2903b976178eb63aef2c8b09473d
2013-04-06 10:41:29 +02:00
Laurent Destailleur
1cf2276584
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
htdocs/comm/prospect/list.php
2013-04-05 22:59:06 +02:00
Laurent Destailleur
815bb82b0e
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-04-05 22:51:19 +02:00
Laurent Destailleur
5f2ea4c65c
Merge pull request #804 from atm-maxime/develop
...
Fixes on invoice payment list and for price by quantity
2013-04-05 13:49:52 -07:00
Laurent Destailleur
bbb0854517
Merge pull request #803 from FHenry/3.3
...
Fix[ bug #774 ] Bug on creating event with box "all day" crossed
2013-04-05 13:49:11 -07:00
Laurent Destailleur
a3c5db968e
Merge pull request #800 from FHenry/develop
...
Qual : Review code after intalling PHPUnit, CodeSniffer on Eclipse...
2013-04-05 13:39:52 -07:00
Laurent Destailleur
a5f72bfb4e
Fix: Some fix after patch merge.
2013-04-05 22:38:46 +02:00
Laurent Destailleur
49c9df3688
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-04-05 22:29:21 +02:00
Laurent Destailleur
7ebd24daea
Merge pull request #805 from zedzedtop/develop
...
Develop
2013-04-05 13:28:58 -07:00
Laurent Destailleur
b47765f721
Optimize for smartphones
2013-04-05 22:26:41 +02:00
Laurent Destailleur
1fb3159045
Qual: Uniformize code
2013-04-05 18:09:05 +02:00
Laurent Destailleur
77050340df
Fix: Do not loose value dol_use_jmobile when using not connected pages
...
(support and forget password)
2013-04-05 17:50:45 +02:00
Laurent Destailleur
58277b0fff
Look: Replace table with div
2013-04-05 17:39:27 +02:00
Laurent Destailleur
ff4c9c495a
Fix: Uniformize field names
2013-04-05 13:35:09 +02:00
fhenry
dfcb38d13f
[ task #793 ] Add extrafield feature into Orders module
2013-04-05 12:43:00 +02:00
fhenry
dcd960a957
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/install/mysql/migration/3.3.0-3.4.0.sql
Change-Id: I2196e69ebae5a057eb6df018b683ff35f721ead9
2013-04-05 11:46:09 +02:00
fhenry
81b34f9918
Fix Error come from [Dolibarr-dev] Errors on comm/mailing/index.php page
...
mail
2013-04-05 09:23:31 +02:00
Laurent Destailleur
d8a86453e5
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-04-04 21:15:16 +02:00
Laurent Destailleur
677fb46136
Optimize size of graph
2013-04-04 21:13:51 +02:00
Maxime Kohlhaas
9530e103e8
Fix : price by quantity now updates the discount field only if there is not an existing discount greater than the price by quantity one
2013-04-04 20:44:00 +02:00
juanjo
61b28274f7
[ bug #790 ] Spanish localtax RE not being correctly calculated
2013-04-04 16:32:06 +02:00
fhenry
c109467d20
Qual : Review code after intalling PHPUnit, CodeSniffer on Eclipse...
2013-04-04 13:58:33 +02:00
Laurent Destailleur
4996a4b217
Fix: regex not complete
2013-04-04 12:23:12 +02:00
Laurent Destailleur
281cd49f32
Merge pull request #798 from lrq3000/develop3
...
Add: ODTSubstitution and ODTSubstitutionLine hooks with $odfHandler for ...
2013-04-04 02:36:30 -07:00
Laurent Destailleur
76910d4159
Look: Start to use div to render actions buttons
2013-04-03 18:37:54 +02:00
Laurent Destailleur
545ac638b0
Qual: Removed deprecated code for using a specific mobile theme.
...
New: Include terminal variables to optimize any themes.
Qual: First change to allow butAction buttons to wrap on new lines for
small size screens.
2013-04-03 15:20:56 +02:00
Stephen L
cb3f183353
Add: ODTSubstitution and ODTSubstitutionLine hooks with $odfHandler for extended ODT substitution
...
Signed-off-by: Stephen L. <lrq3000@gmail.com>
2013-04-03 00:57:40 +02:00
Laurent Destailleur
3312e620b4
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-04-03 00:37:05 +02:00
Laurent Destailleur
08be243dc4
Optimize with smartphone
2013-04-03 00:36:31 +02:00
fhenry
9572eebae0
Check style
...
(http://www.dolibarr.fr/forum/3-installation/40712-sauvegarde )
2013-04-02 22:22:57 +02:00
fhenry
735e107a51
Better error management on extrafailed input
2013-04-02 14:12:21 +02:00
fhenry
e93b6141e1
Add translation for extrafield
2013-04-02 12:04:37 +02:00
fhenry
893fed9284
[ task #783 ] Add checkbox and radio into extrafield feature
2013-04-02 11:56:53 +02:00
fhenry
d03fb5d363
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-04-02 10:53:29 +02:00
fhenry
489d62dbf1
Better extrafield date management
2013-04-02 10:52:39 +02:00
Laurent Destailleur
f98e40f694
Optimize for smartphone
2013-04-02 10:26:11 +02:00
Laurent Destailleur
c8bc0a1ec9
New: Prepare to code to support jmobile.
2013-04-01 23:38:39 +02:00
Laurent Destailleur
aba9fd8fc5
Fix: Nowrap
2013-04-01 23:01:38 +02:00
Laurent Destailleur
29a1640b4c
Qual: Normalize field ref_supplier into supplier invoices (replace
...
facnumber).
2013-04-01 22:39:27 +02:00
Laurent Destailleur
cf4603f5af
Merge pull request #793 from jfefe/extrafields
...
Task #784 : display calendar into data type extrafields / new methods to manage extrafields
2013-04-01 12:00:08 -07:00
Laurent Destailleur
9449345395
Another step for menu management rewriting
2013-04-01 20:15:52 +02:00
jfefe
cf6f4405cb
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into extrafields
...
Conflicts:
htdocs/comm/propal.php
2013-04-01 19:44:55 +02:00
jfefe
ec52f54a52
Unique function to show input or output of extrafields datas
2013-04-01 18:59:05 +02:00
jfefe
6e66922a6b
Fix : in extrafield force output for date selector
2013-04-01 18:46:53 +02:00
Laurent Destailleur
3c37f89d2e
Work on new menu managers - step x
2013-04-01 16:02:16 +02:00
Laurent Destailleur
e352e4a56f
New: Work on new menu management.
2013-03-31 19:54:56 +02:00
Laurent Destailleur
cc69cf7b76
New: Can defined a clicktodial setup per user
2013-03-31 16:44:24 +02:00
Laurent Destailleur
294a085047
New: ClickToDial setup is easier
2013-03-31 04:03:08 +02:00
Laurent Destailleur
dca3179bfe
New: Support __LOGIN__ and __USERID__ on left menu entries
2013-03-30 21:29:14 +01:00
Laurent Destailleur
a5799b3ae8
Trans for SMS
2013-03-30 21:25:00 +01:00
Laurent Destailleur
ef571de960
New: Support __USERID__ into menu entries
2013-03-30 20:34:13 +01:00
Laurent Destailleur
4c1f17f42f
Qual: More robust error management for menu description
2013-03-30 19:11:52 +01:00
jfefe
1ab1d74c77
New option (MAIN_EXTRAFIELDS_USE_TWO_COLUMS) to split extrafields display into 2 columns
2013-03-30 17:52:59 +01:00
jfefe
3fe1b26136
New method to CommonObject to display extrafields data output
...
Try for product
2013-03-30 17:43:21 +01:00
Laurent Destailleur
4208f11d87
Enhance fixutf8bomfiles and fixdosfiles tools.
2013-03-30 15:57:54 +01:00
Laurent Destailleur
89365786a8
New: enhance tool fixdosfiles.sh
...
Convert DOS files to unix
2013-03-30 14:27:13 +01:00
Laurent Destailleur
3c23a717fd
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
htdocs/comm/propal.php
htdocs/core/lib/files.lib.php
2013-03-30 14:10:15 +01:00
Laurent Destailleur
e0baa0fe46
Generalize fix: file with a specific mask not found, again
...
Conflicts:
htdocs/comm/propal.php
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/expedition/fiche.php
htdocs/fichinter/fiche.php
2013-03-30 14:04:09 +01:00
Laurent Destailleur
3c248ce1fe
Merge pull request #790 from jfefe/extrafields
...
Work on task #784 : display calendar into data type extrafields
2013-03-30 05:27:14 -07:00
jfefe
95d8ee8b41
Revert "Show number with dot to avoid error when update extrafield"
...
This reverts commit 76efc04840
2013-03-30 10:49:52 +01:00
jfefe
60e72a770a
Merge branch 'develop' into extrafields
2013-03-29 22:25:48 +01:00
jfefe
649c1f3721
Try new function to set array_options to object (extrafields values) with date sent by forms
2013-03-29 22:25:02 +01:00
BENKE Charles
701814ad19
Update mysqli.class.php
2013-03-29 21:19:22 +01:00
Laurent Destailleur
e40909144d
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-03-29 18:30:05 +01:00
Laurent Destailleur
97a90b0904
New: Add more ODT tags
2013-03-29 16:45:40 +01:00
Laurent Destailleur
ff5b2b3404
Merge pull request #786 from defrance69/patch-21
...
Update mysql.class.php
2013-03-29 08:32:17 -07:00
Laurent Destailleur
4c47393b51
Fix: Add more ODT tags
2013-03-29 16:18:55 +01:00
Laurent Destailleur
8f331adff6
New: Work on men management rewrite
2013-03-29 16:16:26 +01:00
Laurent Destailleur
006050b6cd
Fix: left menu not always opened
2013-03-29 15:39:35 +01:00
jfefe
1a1aebf793
Display date extrafield with correct format
2013-03-29 14:56:31 +01:00
jfefe
80f080f5a9
Format date for sql query
...
Using dol_print_date because db->idate doesn't work
2013-03-29 14:45:40 +01:00
jfefe
c53564c454
For extrafield with date type show calendar instead basic input field
2013-03-29 14:03:39 +01:00
jfefe
520e235207
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into extrafields
2013-03-29 10:44:35 +01:00
BENKE Charles
d5a1f64e76
Update mysql.class.php
...
some other problems about DDLCreateTable, other field setting not actived
2013-03-29 02:09:19 +01:00
Laurent Destailleur
2e3fd0083a
Merge pull request #785 from FHenry/develop
...
Add more information in ODT project template
2013-03-28 15:40:46 -07:00
fhenry
c2be118efd
Add more information in ODT project template
2013-03-28 20:51:00 +01:00
Laurent Destailleur
8ad801d0b6
Merge pull request #784 from jfefe/extra_error
...
Better error management when add/update extrafields
2013-03-28 11:12:58 -07:00
Laurent Destailleur
4e97a41612
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-03-28 16:29:22 +01:00
jfefe
ed2b359dae
Bad parameter when calling setEventMessage function
2013-03-28 06:48:21 +01:00
Laurent Destailleur
07062065e5
Merge pull request #782 from jfefe/propal_odt_choice
...
New : can choose to generate the ODT document according to the status of a propale
2013-03-27 13:35:34 -07:00
jfefe
013eac1147
Better error management when add/update extrafield
...
Usage of setEventMessage() function
2013-03-27 21:24:45 +01:00
Laurent Destailleur
753bfdbec2
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-03-27 20:43:43 +01:00
Laurent Destailleur
0a3b7e7994
New: Be able to get path of image without tag img
2013-03-27 20:43:28 +01:00
Regis Houssin
55757a6b82
Fix: $i is global
2013-03-27 20:42:55 +01:00
jfefe
0b7d13d463
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into extrafields
2013-03-27 20:39:56 +01:00
jfefe
1f537300ea
Add hidden option MAIN_PROPAL_CHOOSE_ODT_DOCUMENT to enable choice of ODT document to use according to his status
2013-03-27 19:11:42 +01:00
Laurent Destailleur
f27f601a73
Merge pull request #780 from FHenry/develop
...
Add information on Project ODT into ODT project
2013-03-27 07:56:33 -07:00
jfefe
ee52e1a487
Merge remote-tracking branch 'upstream/develop' into propal_odt_choice
2013-03-27 15:25:13 +01:00
Laurent Destailleur
a22d39adfb
Fix: Hook is a replaceadd hook.
2013-03-27 14:11:15 +01:00
fhenry
9507f4258b
Add inforamtion on Project into ODT project
2013-03-26 23:32:22 +01:00
Regis Houssin
e75c609a0a
Fix: wrong var name
2013-03-26 18:33:44 +01:00
Regis Houssin
b5d13dc6e6
Fix: missing parameter
2013-03-26 18:33:23 +01:00
Regis Houssin
e9a8457d7e
Fix: broken features due to the removal of the trigger FILE_UPLOAD !
2013-03-26 18:33:14 +01:00
Regis Houssin
61826b04d8
Fix: broken feature for use hooks with dol_move_uploaded_file method
2013-03-26 18:33:06 +01:00
Regis Houssin
a701cbd77c
Fix: wrong var name
2013-03-26 17:47:37 +01:00
Laurent Destailleur
b694451ab2
Use engine instead of type
2013-03-26 17:45:07 +01:00
Regis Houssin
4fe94b800b
Fix: missing parameter
2013-03-26 17:43:48 +01:00
Regis Houssin
dff74667c2
Fix: broken features due to the removal of the trigger FILE_UPLOAD !
2013-03-26 17:29:40 +01:00
Regis Houssin
33a82c396e
Fix: broken feature for use hooks with dol_move_uploaded_file method
2013-03-26 17:12:00 +01:00
BENKE Charles
2c56a1c8dc
Update mysql.class.php
...
Create Table 'type' not supported on recent mysql databases, need to use 'engine' instead
2013-03-26 16:49:02 +01:00
frederic34
1cd39df82b
Merge remote-tracking branch 'upstream/develop' into develop
2013-03-26 10:24:46 +01:00
frederic34
4c29eaecd1
Print IPP
2013-03-26 10:23:00 +01:00
Sébastien de Chateauvieux
28999af70b
TVA NPR : set function get_default_npr
2013-03-26 08:47:17 +04:00
Laurent Destailleur
55a9d3abf1
Merge pull request #776 from FHenry/develop
...
[ task #770 ] Add ODT document generation for Projects module
2013-03-25 15:52:30 -07:00
fhenry
9dd4ed9cb8
[ task #770 ] Add ODT document generation for Projects module
2013-03-25 19:28:34 +01:00
BENKE Charles
8b160ac712
Update modAgenda.class.php
...
Add export feature of calendar module
2013-03-25 18:26:35 +01:00
Laurent Destailleur
6a34250712
Rewrite module manager. Next step.
2013-03-25 17:54:54 +01:00
fhenry
7881502b52
[ task #773 ] Add Project document in GED(ECM) modules
2013-03-25 09:56:07 +01:00
Laurent Destailleur
4fb4734eed
Merge pull request #772 from grandoc/develop
...
fix : trad error
2013-03-24 15:08:24 -07:00
Laurent Destailleur
4e029bf2ca
Fix: Security does not need special case
2013-03-24 21:06:45 +01:00
Laurent Destailleur
b3d4811b6f
New: Another method to allow style tags into email.
...
Preivous one was using encoding, but this create data to not be stored
correctly into database. Old method is still available by adding
'_encoded' at end of toolbar name.
2013-03-24 19:00:58 +01:00
Laurent Destailleur
3ef8bf55fa
Fix: Better line position of information
2013-03-24 16:17:36 +01:00
Laurent Destailleur
ff2407a454
Add hidden option to setup font size of information.
2013-03-24 14:01:33 +01:00
Grand Philippe
c5e742278e
fix : trad error
2013-03-24 07:11:44 +01:00
Laurent Destailleur
a890c7b3ab
Fix: Option to hide if no permission instead of grey was broken.
2013-03-24 03:51:49 +01:00
Laurent Destailleur
9391d0d2d6
New: SeparatorThousand and SeparatorDecimal accepts ' chars.
2013-03-24 03:12:40 +01:00
Laurent Destailleur
fe7cad8d6a
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-03-24 02:28:29 +01:00
Laurent Destailleur
24427d2c65
Use combo list for revenue stamp
2013-03-24 00:35:40 +01:00
fhenry
d84cd86a50
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop
Merge Cron module
2013-03-23 20:24:28 +01:00
Laurent Destailleur
c3589e9785
Some debug into cron module:
...
- Because cron is a module, constant must start with CRON_.
- Miscellanous fixes.
- For external link to run jobs from url, we must forge url using conf
file and not autodetect url.
2013-03-23 19:23:17 +01:00
Laurent Destailleur
9fe0d2cdd2
Fix: Removed a lors 'pre'. Also accurency of data must not be overwrite
...
by odt template engine (to be compatible with all countries precision).
2013-03-23 18:22:25 +01:00
Laurent Destailleur
73de8d169f
Fix: Avoid call method on non object error
2013-03-23 18:04:46 +01:00
Laurent Destailleur
fbf8d410d2
New: Support revenue stamp onto invoices
2013-03-23 17:34:23 +01:00
fhenry
8971e6fe15
[ task #710 ] Envoi de mail
2013-03-23 14:39:23 +01:00
eldy
90025f9c13
Work on revenue stamp
2013-03-23 13:07:25 +01:00
eldy
c8d6e9e44a
Fix: List of customers to build invoice or order
2013-03-23 12:33:25 +01:00
eldy
3af7ca5ac8
Work on revenue stamp feature.
2013-03-23 12:23:09 +01:00
Regis Houssin
34bfdb1846
Fix: broken feature if the table has no field fk_parent_line
2013-03-22 19:21:46 +01:00
Laurent Destailleur
350bcea183
Merge
2013-03-22 17:10:17 +01:00
Laurent Destailleur
708f0472cd
Qual: Prepare menu handler to be able to output content into a list.
2013-03-22 16:40:35 +01:00
Laurent Destailleur
bf912e2c78
Fix: Some bug into supplier pdf invoice setup.
2013-03-19 15:19:31 +01:00
Christophe Battarel
e2f28b6c51
remove experimental commissions module
2013-03-18 15:40:56 +01:00
Laurent Destailleur
45a6717dd3
Merge pull request #752 from FHenry/develop
...
task #768 & task #769
2013-03-18 05:02:38 -07:00
Laurent Destailleur
c6b4259735
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-03-17 19:40:41 +01:00
Laurent Destailleur
7703537b96
New: Work on cron module
2013-03-17 19:39:53 +01:00
Grand Philippe
29b8ce1c2d
try to fix: supplier invoice numbering
2013-03-17 15:27:52 +01:00
Grand Philippe
6afa1cb2c9
normalize
2013-03-17 14:40:49 +01:00
Grand Philippe
57d20e28fb
normalize and simplify code
2013-03-17 12:56:54 +01:00
Grand Philippe
88256b7531
normalize
2013-03-17 10:21:44 +01:00
Grand Philippe
bda1c7656b
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop
2013-03-17 10:03:29 +01:00
Grand Philippe
d2c10159fe
try to fix : cannot display numbering models
2013-03-16 17:10:24 +01:00
Laurent Destailleur
33a7692fbc
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
htdocs/core/menus/standard/eldy.lib.php
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
htdocs/core/modules/propale/doc/pdf_azur.modules.php
htdocs/exports/class/export.class.php
2013-03-16 17:07:35 +01:00
Laurent Destailleur
013b7eca10
Fix: A better fix for status/list of orders.
...
There was a confusion because of bad translation key StatusOrderToBill
that in fact mean "StatusOrderDelivered".
More explanation:
http://wiki.dolibarr.org/index.php/Module_Customers_Orders#Life_cycle_.2F_Business_rules
2013-03-16 17:02:13 +01:00
Grand Philippe
86dff79b73
try to fix : cannot display numbering models
2013-03-16 16:58:45 +01:00
Laurent Destailleur
2da3fb68a0
Merge pull request #751 from jfefe/extrasep
...
New type of extrafield : separator
2013-03-16 07:41:34 -07:00
Laurent Destailleur
ca0d3be33b
Merge pull request #750 from grandoc/develop
...
Develop
2013-03-16 07:40:05 -07:00
Laurent Destailleur
d590aa56eb
Merge pull request #749 from simnandez/3.3
...
Fix: Bad orders list viewstatut filter if expeditons module is disabled
2013-03-16 07:39:31 -07:00
Laurent Destailleur
fcef334122
Merge pull request #748 from GPCsolutions/naturalsearch
...
Natural search
2013-03-16 07:38:55 -07:00
Grand Philippe
7a69066dc8
enhancement of suppliers module
2013-03-16 15:24:14 +01:00
Grand Philippe
cdb521663e
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop
2013-03-16 10:35:12 +01:00
fhenry
cf21b32eb1
task #768
2013-03-16 09:46:34 +01:00
fhenry
98cc7b7a2b
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-03-16 09:43:57 +01:00
fhenry
e71103ed02
task #768 :
...
https://doliforge.org/tracker/?func=detail&aid=768&group_id=144
task #769 :
https://doliforge.org/tracker/?func=detail&aid=769&group_id=144
2013-03-16 09:23:34 +01:00
jfefe
65a9edd5a7
Fix : lang
2013-03-16 01:52:56 +01:00
jfefe
5f1141675c
Add constants into config of ODT document for propal : can choose wich ODT will be used on creation and when close to bill or not.
2013-03-16 01:10:21 +01:00
jfefe
ba0963ea7d
Fix : implement separator extrafield - missing check on update
2013-03-16 00:00:57 +01:00
jfefe
b36b776f10
IKM : work on new extrafield separator type
2013-03-15 23:39:18 +01:00
Grand Philippe
7dbc782d42
prepair numbering models for supplier invoices
2013-03-15 19:03:07 +01:00
jfefe
b1d50e3f7f
Move extrafield type select list on top of form
2013-03-15 18:56:44 +01:00
jfefe
654e99df8c
Work on new type of extrafield : separator with no field stored in database
2013-03-15 18:56:10 +01:00
Grand Philippe
e46900ad84
prepair numbering models for supplier invoices
2013-03-15 18:40:31 +01:00
Laurent Destailleur
9bae946178
Fix: Return of function with no return should not be set into a
...
variable.
2013-03-15 18:27:48 +01:00
jfefe
74f480a53b
Merge remote-tracking branch 'upstream/develop' into extrafields
2013-03-15 18:21:03 +01:00
Laurent Destailleur
8a487a90af
New: Still working on menu manager rewrite.
2013-03-15 18:00:29 +01:00
Grand Philippe
8f7c629d9c
prepair numbering models for supplier invoices
2013-03-15 17:45:25 +01:00
Laurent Destailleur
7a152c8e0b
Prepare code to be compatible when we will store localtax_type into
...
lines.
2013-03-15 17:29:18 +01:00
Laurent Destailleur
f522b18bdc
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-03-15 17:14:06 +01:00
Laurent Destailleur
2ab28d974f
Fix: Use better test to show localtax to avoid problem when switching
...
from different country.
Perf: Can return all localtaxes in one call.
2013-03-15 17:10:18 +01:00
Laurent Destailleur
1a62cdfbe8
Fix: Use better test to show localtax to avoid problem when switching
...
from different country.
2013-03-15 17:06:42 +01:00
Grand Philippe
a9eed57e27
prepair numbering models for supplier invoices
2013-03-15 16:43:28 +01:00
simnandez
c0e5cacafc
Fix: Bad orders list viewstatut filter if expeditons module is disabled
2013-03-15 16:18:14 +01:00
Grand Philippe
b0bce23595
prepair numbering models for supplier invoices
2013-03-15 16:16:38 +01:00
Raphaël Doursenaud
16efed11ca
Added natural search to product line search
2013-03-15 16:05:49 +01:00
Grand Philippe
3c7c5f262f
anglicization of comments
2013-03-15 16:03:03 +01:00
Laurent Destailleur
a86c6ac39d
New: price function can show price with currency symbol.
2013-03-15 15:59:51 +01:00
Laurent Destailleur
b6a30bb748
Merge pull request #742 from grandoc/develop
...
change birth instead of naiss
2013-03-15 04:05:18 -07:00
fhenry
9f9f6c8311
[ task #767 ]
2013-03-15 11:59:15 +01:00
Laurent Destailleur
fbdf438351
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
2013-03-14 17:01:44 +01:00
