Christophe Battarel
e459736977
add function gettypeoflocaltax and modify pdf models
2012-11-28 17:47:15 +01:00
Maxime Kohlhaas
5e5cb1da92
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
2012-11-28 14:53:48 +01:00
Laurent Destailleur
caab5ac4e0
New: Add option to be able to select onto automatic event and manual
...
event (or both) into calendar view. Note: For backward compatibility
reason, this will works only for new events.
Qual: Disable old deprecated event code.
2012-11-28 14:47:30 +01:00
Christophe Battarel
f0918a2536
remove unused arrays into pdf models (localtaxes)
2012-11-28 12:13:03 +01:00
Christophe Battarel
1e8aae4de4
show local taxes on crabe pdf model
2012-11-28 12:11:42 +01:00
Laurent Destailleur
b34ce6e2f0
Merge pull request #495 from cbattarel/develop
...
[ task #204 ] Manage canadian, spain and other country double VAT with a generic system. various updates for local taxes
2012-11-28 02:08:07 -08:00
Maxime Kohlhaas
32f5b4efa6
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
2012-11-28 10:57:51 +01:00
Christophe Battarel
b9cdde88c7
show localtaxes on einstein pdf model
2012-11-28 10:43:21 +01:00
Christophe Battarel
f00b4b5527
correction to allow global local tax (type 7) on localtax1
2012-11-28 10:24:40 +01:00
Laurent Destailleur
65110ead88
Merge pull request #496 from FHenry/develop
...
Update Common Object update_contact method to allow to change the
2012-11-27 11:32:53 -08:00
fhenry
5c94912e66
Add datehourpicker in editfieldval method to allow display of hour
2012-11-27 18:35:51 +01:00
simnandez
8dc0aec754
[ task #204 ] Manage canadian, spain and other country double VAT with a
...
generic system. Add spanish tests
2012-11-27 16:52:52 +01:00
Christophe Battarel
203a03c4d1
show local taxes on pdf propale azur model
2012-11-27 15:56:45 +01:00
Christophe Battarel
46089bb03c
also update ttc with global local taxes
2012-11-27 15:43:52 +01:00
Christophe Battarel
e87bb02323
retrieve global local taxes in update_price function
2012-11-27 15:34:46 +01:00
Christophe Battarel
9f03b56348
dont put global local tax on lines
2012-11-27 15:33:11 +01:00
fhenry
f456a4d0fe
Update Common Object update_contact method to allow to change the
...
fk_socppoeple linked
2012-11-27 15:26:14 +01:00
Laurent Destailleur
49730ac24f
Code comments only
2012-11-27 13:58:06 +01:00
Laurent Destailleur
c9edac9cd6
Try to fix differently pb of change/keyup because current change has a
...
regression (no way to use ajax select onto supplier orders when using
keybord or mouse selection).
2012-11-26 13:33:18 +01:00
Laurent Destailleur
d9fb0c941b
Qual: remove select to have id same with combo and ajax
2012-11-26 13:28:02 +01:00
Laurent Destailleur
641f4b1ecc
Qual: Change to unformize returns of hooks.
2012-11-26 13:26:50 +01:00
Laurent Destailleur
4480af348c
Fix: Cols at wrong place
2012-11-26 11:57:20 +01:00
Laurent Destailleur
b4ebd7e852
Qual: Uniformize code and fix a regression
2012-11-26 11:36:45 +01:00
Maxime Kohlhaas
437d082308
Fix : multicompany comptability
2012-11-24 00:06:54 +01:00
Maxime Kohlhaas
9e4cba13c8
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko559
...
Conflicts:
htdocs/install/mysql/migration/3.2.0-3.3.0.sql
2012-11-22 15:24:10 +01:00
Laurent Destailleur
e76ef823b8
New: Add a tab into members statistics to count members by nature.
2012-11-21 23:01:36 +01:00
Laurent Destailleur
59a305f6f1
New: no dash line if last item.
2012-11-21 20:35:51 +01:00
Laurent Destailleur
1f263943c5
New: Add option to add slashes lines between lines into PDF.
2012-11-21 19:07:03 +01:00
Laurent Destailleur
c0c13b862a
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2012-11-21 14:45:33 +01:00
Laurent Destailleur
af637c8afb
Qual: Removed "dolibarr" into default email sender.
2012-11-21 14:45:02 +01:00
Laurent Destailleur
d9cdb542d5
Debug filter during export
2012-11-20 14:07:52 +01:00
Laurent Destailleur
ddb3cf6f42
Fix: Debug holiday module
2012-11-20 13:14:16 +01:00
Laurent Destailleur
a62583e987
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2012-11-20 12:33:24 +01:00
Laurent Destailleur
2d000b5df8
Fix: The default select choice was not selected when using jquery dialog
...
confirm boxes.
2012-11-20 12:23:32 +01:00
Regis Houssin
2d5368e135
Fix: converting line delimiters
2012-11-20 12:11:19 +01:00
Regis Houssin
a3d9b5788c
Fix: use keyup instead change to avoid loosing the product id
...
Fix: strict mode
2012-11-20 12:09:52 +01:00
Laurent Destailleur
e53f6a383d
Fix: Removed a hard coded error code.
2012-11-20 11:23:34 +01:00
Laurent Destailleur
0fb126a7e3
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2012-11-19 17:30:57 +01:00
Laurent Destailleur
3b861598a7
Doc
2012-11-19 17:29:57 +01:00
simnandez
3fe79b379d
Fix: Bad calculation of localtax amount calculation if type of
...
localtaxes are 1 3 or 5. Researched by Eldy
2012-11-19 17:10:28 +01:00
Maxime Kohlhaas
ec37a5e005
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko559
2012-11-19 13:31:23 +01:00
Laurent Destailleur
6512fd90a9
New: Can export customer shipments.
2012-11-18 15:24:01 +01:00
Laurent Destailleur
e0de91144a
Merge pull request #484 from simnandez/develop
...
Fix: Local taxes. If buyer not subject to localtax no need make database
2012-11-18 03:11:37 -08:00
Laurent Destailleur
19b7cc66d5
Qual: Remove hidden option so is not efficient and not used files.
...
Qual: Uniformize code
2012-11-17 11:48:51 +01:00
Laurent Destailleur
61ed6e10e1
Uniformize code
2012-11-16 18:59:03 +01:00
simnandez
5515f15187
Fix: Localtaxes rules for spain
2012-11-16 16:23:51 +01:00
Laurent Destailleur
2e8e1f759f
New: Add warning when we try to load sql from an not existing dir
2012-11-16 13:25:49 +01:00
simnandez
b7f38def61
Fix: Local taxes. If buyer not subject to localtax no need make database
...
access
2012-11-16 12:13:29 +01:00
Laurent Destailleur
511a75b5de
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2012-11-14 18:59:07 +01:00
Laurent Destailleur
4c4eeaac2a
Fix: Test fails if value is 0
2012-11-14 18:56:47 +01:00
