Laurent Destailleur
|
385d3612c5
|
Merge pull request #1136 from jfefe/extrarequired
Missing checks on extrafields
|
2013-07-27 03:09:44 -07: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
|
f2f8d60f19
|
Fix: date must be reported according to user timezone
|
2013-07-26 15:21:32 +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 |
|
jfefe
|
95bc40d0df
|
Missing attribute to indicate required fields
|
2013-07-26 08:51:22 +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
|
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
|
df27538d74
|
Merge pull request #1122 from FHenry/3.4
Avoid PHP warning
|
2013-07-23 09:31:16 -07: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 |
|
lalaina rasamoelina
|
4ecc9b30a9
|
Delete the name of user who are disable in the creation of events
|
2013-07-22 11:17:45 +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
|
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 |
|
Laurent Destailleur
|
3896cde299
|
Removed useless method. Prefer using generic method.
|
2013-07-19 13:38:57 +02:00 |
|
Maxime Kohlhaas
|
01e4d905fb
|
Start work on bank sharing for multi-company
|
2013-07-19 09:19:20 +02:00 |
|
Maxime Kohlhaas
|
63e6cf5c81
|
Add possibility to define dependencies between extra lists
|
2013-07-18 17:42:09 +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 |
|
Laurent Destailleur
|
df88dc2f23
|
Use a better variable name
|
2013-07-17 14:57:20 +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 |
|
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
|
c7f3778b90
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
|
2013-07-16 00:21:06 +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
|
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
|
7cdc7c0ab2
|
Fix: Typo
|
2013-07-13 19:41:27 +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
|
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
|
57dbf87d0a
|
Just use print instead of echo, just because echo is not use anuwhere
else.
|
2013-07-10 15:45:16 +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 |
|
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
|
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
|
2fc07d05e9
|
hook in form_attach_new_file(html.formfile.class.php)
|
2013-07-09 18:12:43 +02:00 |
|
Laurent Destailleur
|
c1cb5e9bff
|
Fix geoipmaxmind module
|
2013-07-09 00:19:58 +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
|
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
|
2cdf621b75
|
New: Provide relativepath as parameter
|
2013-07-05 14:55:24 +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 |
|
Raphaël Doursenaud
|
b9ff5188b3
|
Normalized EOL
|
2013-07-01 12:00:42 +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
|
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 |
|
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 |
|
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 |
|
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
|
b49a1168e3
|
Fix: Use div for tables when there is a different form on each line.
|
2013-06-23 18:33:03 +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
|
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
|
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
|
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
|
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
|
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 |
|
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
|
8ed5dfeded
|
Fix: Bad styles of html elements
|
2013-06-14 02:15:43 +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
|
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 |
|
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 |
|
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
|
421c3fb35b
|
Fix: Bad param 'zone' into printCommon
|
2013-06-07 13:41:32 +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 |
|
Regis Houssin
|
c9a71439b2
|
Fix: EOF
|
2013-06-05 16:24:32 +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
|
e871ea64eb
|
Fix: Regression
|
2013-06-03 19:52:34 +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
|
5bba5782a4
|
Merge remote-tracking branch 'origin/3.4' into develop
|
2013-05-29 21:22:27 +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 |
|
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
|
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 |
|
fhenry
|
40827a7ef3
|
Add generic behaviour in showphoto of html.form.class.php
|
2013-05-21 14:52:39 +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 |
|
fhenry
|
cb182752cc
|
Report divert bug fixing from 3.4
|
2013-05-19 18:47:14 +02: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
|
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 |
|
fhenry
|
1c1736fa20
|
Fix bad Warning: Bad formed request converted PGSQL
|
2013-05-17 19:30:48 +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
|
658f0af428
|
Fix: Removed warning
|
2013-05-16 15:13:08 +02:00 |
|