Laurent Destailleur
d3f29649d5
Fix into div/br
2013-04-16 01:23:33 +02:00
Laurent Destailleur
10ab1a583a
Look: Optimize screens
2013-04-16 01:13:20 +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
Marcos García
7c4b901b0a
Improved es_ES translations and replaced missing translation
2013-04-13 17:45:41 +02:00
Laurent Destailleur
ae01285fe9
Look: Replace table with div.
...
Look: Optimize for smartphone
2013-04-12 16:16:39 +02:00
Marcos García
9ec74194a0
Translated linked object propal module name
2013-04-11 23:10:27 +02:00
Laurent Destailleur
b496436fe3
Qual: Reduce number of methods. Mutualize update_note code.
2013-04-10 10:58:38 +02:00
fhenry
275bf67bb7
[ task #811 ] Uniformanize note field
2013-04-09 17:18:07 +02:00
Laurent Destailleur
76910d4159
Look: Start to use div to render actions buttons
2013-04-03 18:37:54 +02:00
Régis Houssin
e139e63d92
Fix: missing $soc object with origin object
2013-04-02 12:01:39 +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
a8874ebcc8
Uniformize usage of extrafields methods
2013-04-01 19:43:26 +02:00
Laurent Destailleur
89365786a8
New: enhance tool fixdosfiles.sh
...
Convert DOS files to unix
2013-03-30 14:27:13 +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
a5e66ab7ba
Generalize fix: file with a specific mask not found, again
2013-03-30 13:54:46 +01:00
jfefe
e99ba51f1d
Use of new function to set optionals from add / update form
...
Format date display for data from JS calendar (date type extrafield)
2013-03-30 10:46:23 +01:00
Regis Houssin
1e3b26a104
Fix: file with a specific mask not found, again
2013-03-29 11:54:22 +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
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
jfefe
f16c9dd3ac
Fix : bad permission
2013-03-16 00:19:53 +01:00
jfefe
f1a05528ad
Show extrafield separator on invoice
2013-03-16 00:16:30 +01:00
Laurent Destailleur
a86c6ac39d
New: price function can show price with currency symbol.
2013-03-15 15:59:51 +01:00
jfefe
ba8525bd6a
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into extrafields
...
Conflicts:
htdocs/install/doctemplates/invoices/template_invoice.odt
htdocs/install/doctemplates/proposals/template_proposal.odt
htdocs/install/mysql/migration/3.3.0-3.4.0.sql
2013-03-11 05:21:35 +01:00
simnandez
0c8d3336c2
[ task #707 ] Create option ProfIdx are mandatory to validate a invoice
2013-03-07 18:41:56 +01:00
jfefe
3ccb0fb92c
Edit extrafields on customer invoice
2013-03-06 04:54:08 +01:00
jfefe
7260e139df
Add extrafields support when create a customer invoice
2013-03-06 04:17:14 +01:00
Laurent Destailleur
c37e873ab4
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
htdocs/comm/propal.php
htdocs/commande/fiche.php
2013-03-05 18:32:01 +01:00
fhenry
f793ed83f6
Fix [ bug #747 ]
2013-03-04 15:36:40 +01:00
Grand Philippe
b081589129
english language standardization
2013-02-25 09:52:24 +01:00
Laurent Destailleur
327f4062c7
New: Prepare code to be able to choose bank account to show when
...
building pdf and payment mode is withdraw.
2013-02-22 12:04:38 +01:00
simnandez
4cb6072f03
New: [ task #707 ] Create option ProfIdx are mandatory to validate a
...
invoice
2013-02-21 11:03:14 +01:00
Laurent Destailleur
b21cb5b899
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
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/compta/facture.php
htdocs/filefunc.inc.php
2013-02-17 17:25:38 +01:00
Laurent Destailleur
9a951e4d6d
Fix: When creating invoice from other object, type must be standard only
2013-02-17 17:12:19 +01:00
Laurent Destailleur
b434f58af3
Fix: When creating invoice from other object, type must be standard only
2013-02-17 17:12:06 +01:00
Laurent Destailleur
d2074d1a17
Fix: When creating invoice from other object, type must be standard only
2013-02-17 17:06:55 +01:00
Laurent Destailleur
e56e182fe9
Fix: When creating invoice from other object, type must be "standard".
2013-02-17 16:37:28 +01:00
Laurent Destailleur
3eb485d521
Qual: Removed TODO, deprecated code and deprecated properties. This also
...
fix missing combo box of contacts onto CC.
2013-02-12 17:08:21 +01:00
Regis Houssin
fcee35c65d
Fix: $hookmanager is a global object
2013-01-26 10:35:30 +01:00
Laurent Destailleur
56e11e52fa
New: hookmanager class is used frequently and is a factory object, so we
...
can move it during init of environment and use it globally.
2013-01-25 19:12:54 +01:00
Laurent Destailleur
abb6daf2dc
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
htdocs/core/boxes/box_activity.php
2013-01-19 16:29:16 +01:00
Laurent Destailleur
3551dff18a
Fix: [ bug #671 ] Product country origin is automatically entered in
...
description of invoices, but not in invoices generated from orders
2013-01-19 15:57:28 +01:00
Laurent Destailleur
a5b174eccc
Fix: Architecture of getCurrency was wrong. Cache was not stored
...
correctly and dict file loaded several times. There was also bug on PHP
without mb_string function.
Now function is a method of $langs object. All bug fixes.
2013-01-18 15:57:11 +01:00
Laurent Destailleur
d11cee399a
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
COPYRIGHT
htdocs/core/tpl/freeproductline_create.tpl.php
htdocs/core/tpl/predefinedproductline_create.tpl.php
htdocs/install/mysql/tables/llx_c_availability.sql
2013-01-16 15:45:17 +01:00
Laurent Destailleur
8d206fdfb0
Prepare move to other licence. For the moment all answers for licence
...
upgrade were not yet received. So we prepare for GPL by uniformizing
licence text keys to GPL-3+. Will move later to AGPL if all answers are
positive.
2013-01-16 15:36:08 +01:00
simnandez
ffbb611eb4
[ task #652 ] Reduce clicks into creaton of orders, invoices, etc.
2013-01-13 10:57:39 +01:00
