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 |
|
Grand Philippe
|
7f27801c3c
|
fix: Undefined property: stdClass::$xxx
|
2013-05-01 09:41:36 +02:00 |
|
Laurent Destailleur
|
4e0ef01389
|
Qual: nowrap="nowrap" is replaced with a CSS class style .nowrap
|
2013-04-25 01:13:13 +02:00 |
|
Laurent Destailleur
|
b3e2050186
|
Fix: Remove warning
|
2013-04-23 23:44:49 +02:00 |
|
Raphaël Doursenaud
|
62f0f6011f
|
Fixed note typo
|
2013-04-20 06:43:13 +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 |
|
fhenry
|
c109467d20
|
Qual : Review code after intalling PHPUnit, CodeSniffer on Eclipse...
|
2013-04-04 13:58:33 +02:00 |
|
Laurent Destailleur
|
76910d4159
|
Look: Start to use div to render actions buttons
|
2013-04-03 18:37:54 +02:00 |
|
Laurent Destailleur
|
f52fe71018
|
Fix: Bad div closing
|
2013-03-30 19:40:52 +01:00 |
|
Laurent Destailleur
|
89365786a8
|
New: enhance tool fixdosfiles.sh
Convert DOS files to unix
|
2013-03-30 14:27:13 +01:00 |
|
eldy
|
c8d6e9e44a
|
Fix: List of customers to build invoice or order
|
2013-03-23 12:33:25 +01:00 |
|
Laurent Destailleur
|
350bcea183
|
Merge
|
2013-03-22 17:10:17 +01:00 |
|
Laurent Destailleur
|
d0449768f7
|
Use div instead of table
|
2013-03-17 19:31:13 +01:00 |
|
Laurent Destailleur
|
3defd294cb
|
Merge remote-tracking branch 'origin/3.3' into develop
|
2013-03-07 11:08:15 +01:00 |
|
Laurent Destailleur
|
b56723d600
|
Fix: Avoid wrapping
|
2013-03-06 10:06:54 +01:00 |
|
Laurent Destailleur
|
d5822b7fbd
|
Fix: Syntax sql error when adding/editing line of contract and when
company does not use vat.
|
2013-03-05 18:13:27 +01:00 |
|
simnandez
|
a811121daf
|
[ task #731 ] Uniformize ref generation
|
2013-03-02 16:50:36 +01:00 |
|
Laurent Destailleur
|
2dce0c68e8
|
Merge pull request #652 from cbattarel/3.3
3.3 : fix bug in contract update line (wrong vat variable name)
|
2013-02-13 05:56:09 -08:00 |
|
Christophe Battarel
|
4f33249c9e
|
margin management on contract card
|
2013-02-13 10:35:47 +01:00 |
|
Christophe Battarel
|
c6b263c586
|
fix bug in contract update line (wrong vat variable name)
|
2013-02-13 09:53:26 +01:00 |
|
Christophe Battarel
|
44134dec57
|
prepare contract class for margin management
|
2013-02-13 09:50:08 +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
|
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 |
|
Laurent Destailleur
|
4e27969317
|
Merge remote-tracking branch 'origin/3.3' into develop
Conflicts:
htdocs/core/boxes/box_activity.php
|
2013-01-02 22:15:58 +01:00 |
|
Laurent Destailleur
|
96416735df
|
Fix: [ bug #618 ] External accounts can access confidential informations
(a lot)
|
2013-01-02 18:43:59 +01:00 |
|
Laurent Destailleur
|
dbdc4e6ce8
|
Fix: Normalize option names
|
2012-12-31 13:40:13 +01:00 |
|
Regis Houssin
|
b838895db9
|
Fix: change for a neutral email
|
2012-12-30 15:13:49 +01:00 |
|
Regis Houssin
|
5740c7e694
|
Fix: change for a neutral email
|
2012-12-30 15:11:07 +01:00 |
|
Laurent Destailleur
|
18bfceafca
|
Merge remote-tracking branch 'origin/3.3' into develop
|
2012-12-30 14:17:05 +01:00 |
|
Laurent Destailleur
|
ca2b3f11b1
|
Fix: Several fix in trigger names
|
2012-12-30 12:24:53 +01:00 |
|
Marcos García
|
0c113d33a6
|
Removed unuseful code
Some lines may be marked as changed but they are not because of incorrect line endings
|
2012-12-29 13:12:45 +01:00 |
|
Laurent Destailleur
|
8436f0666d
|
Fix: [ bug #252 ] Contrat : pas d'éditeur WYSIWYG
Fix: Margins information must be visible for orders, proposals and
invoices only.
Fix: Delete button for contracts not visible
|
2012-12-28 11:36:31 +01:00 |
|
Laurent Destailleur
|
078b015db8
|
Work on multitax (vat). Need your test.
Qual: Because params were often missing in calculate_price(), params are
now mandatory.
|
2012-11-03 16:32:49 +01:00 |
|
Laurent Destailleur
|
31779cdbd1
|
Fix: Bad date format
|
2012-10-22 00:28:32 +02:00 |
|
Regis Houssin
|
d705995a49
|
Fix: convert line delimiters
|
2012-10-18 10:36:53 +02:00 |
|
Regis Houssin
|
446a81b4c4
|
Fix: move class in template
|
2012-10-18 10:35:55 +02:00 |
|
Laurent Destailleur
|
325d47c882
|
Fix: Creation of notes was not using DolEditor class.
|
2012-10-14 13:18:52 +02:00 |
|
Laurent Destailleur
|
8ff506b120
|
Sec: Sanitize all params page, sortfield and sortorder
|
2012-10-13 14:47:46 +02:00 |
|
Laurent Destailleur
|
9d732b0876
|
Fix: nowrap
|
2012-09-27 12:53:17 +02:00 |
|
Regis Houssin
|
43c0a03758
|
Fix: strict mode tornado
|
2012-09-15 11:21:22 +02:00 |
|
Regis Houssin
|
e19f8c54f1
|
Fix: strict mode hurricane
|
2012-09-15 10:01:35 +02:00 |
|
Laurent Destailleur
|
2c2d17b101
|
Fix: Try a fix to avoid having the hover on array that should not have
it.
|
2012-09-09 13:13:24 +02:00 |
|
Marcos García
|
4209898d20
|
Lower-cased Header function
|
2012-08-31 05:58:38 +02:00 |
|
Laurent Destailleur
|
3771ad2e87
|
Fix: Restore line feed after removing it from select_product function.
|
2012-08-29 09:43:24 +02:00 |
|
Marcos García
|
9b3c89ac47
|
Removed parenthesis from all include and include_once and replaced with single quotes
|
2012-08-23 02:40:41 +02:00 |
|
Marcos García
|
706d79986c
|
Removed parenthesis from all require_once and replaced with single quotes
|
2012-08-22 23:11:24 +02:00 |
|
simnandez
|
c8a1bc5490
|
Qual: A closed contract no more invoiceable
|
2012-08-18 16:42:46 +02:00 |
|