Laurent Destailleur
55856bdc36
Merge pull request #741 from grandoc/3.3
...
fix trad
2013-03-13 08:52:56 -07:00
Laurent Destailleur
6fc57fb90d
Merge pull request #740 from FHenry/3.3
...
Fix syntax error
2013-03-13 08:52:25 -07:00
Laurent Destailleur
8d2d64e9ae
No message when not required
2013-03-13 16:22:11 +01:00
Grand Philippe
82297f52c9
fix trad
2013-03-13 14:40:16 +01:00
Grand Philippe
2d09eb6f8c
fix trad
2013-03-13 12:22:39 +01:00
Laurent Destailleur
5149ea9f51
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-03-13 11:10:51 +01:00
Grand Philippe
5ed94ae9be
fix trad
2013-03-13 11:10:31 +01:00
Laurent Destailleur
60930d9e74
New: Enhance Dolibarr migration process to include migration script of
...
external modules.
2013-03-13 11:06:28 +01:00
fhenry
d4621c3921
Fix syntax error
2013-03-13 10:15:37 +01:00
jfefe
c83691e35a
Missing field fk_thirdparty in user webservice
2013-03-12 20:57:58 +01:00
Laurent Destailleur
4db666824f
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-03-12 16:13:56 +01:00
Laurent Destailleur
390921512c
Move info message on top right
2013-03-12 15:56:47 +01:00
Laurent Destailleur
854cd5dbe3
Merge pull request #736 from simnandez/develop
...
[ task #652 ] Reduce clicks into creaton of orders, invoices, etc. Supplier order
2013-03-12 07:31:04 -07:00
Laurent Destailleur
484c39435c
Fix: Bad format of WSDL for orders. Miscellaneous fixes into WS.
2013-03-12 15:25:58 +01:00
simnandez
8114249fca
[ task #652 ] Reduce clicks into creaton of orders, invoices, etc.
...
Supplier order
2013-03-12 15:06:38 +01:00
Laurent Destailleur
fc3483a4bb
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
htdocs/webservices/server_user.php
2013-03-12 14:55:13 +01:00
Laurent Destailleur
bb2776f4cc
Fix: Bad field
2013-03-12 13:37:34 +01:00
Laurent Destailleur
c6b215d3d0
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-03-12 13:34:45 +01:00
Laurent Destailleur
9c1f70996a
Merge pull request #731 from grandoc/3.3
...
fix some translations
2013-03-12 05:27:15 -07:00
Laurent Destailleur
c1ab042ad1
Merge pull request #733 from defrance69/patch-16
...
Update sendings.lib.php
2013-03-12 05:27:02 -07:00
Laurent Destailleur
c215974c8c
Add missing vat rate for saudi arabia
2013-03-12 12:20:06 +01:00
Laurent Destailleur
e731d954b3
Translation
2013-03-12 12:00:53 +01:00
Laurent Destailleur
7138c6b0f9
T
2013-03-12 11:59:52 +01:00
simnandez
5c4b537a65
Fix: [ bug #762 ] Bad profit calculation in Reporting
2013-03-12 11:49:15 +01:00
Laurent Destailleur
fe072d992c
Fix: WSDL of productorservice was not valid. Normalize field names.
2013-03-12 10:35:24 +01:00
Laurent Destailleur
9527174300
Fix: WSDL of productorservice was not valid. Normalize field names.
2013-03-12 10:31:28 +01:00
Laurent Destailleur
bcf694c255
Qual: Remove deprecated code.
2013-03-12 10:03:19 +01:00
BENKE Charles
425ed19e20
Update sendings.lib.php
...
delivery_prepare_head
complete_head_from_modules object->id
but the good one is $object->origin_id
so we temporary change it
2013-03-11 21:01:04 +01:00
Laurent Destailleur
e01a55876b
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-03-11 19:06:01 +01:00
Laurent Destailleur
fdbd3bf36b
Fix: lastname
2013-03-11 17:41:38 +01:00
Grand Philippe
dd248e9d58
fix : dyslexia
2013-03-11 17:19:03 +01:00
Laurent Destailleur
1df3ad143e
Fix: Lastname lost
2013-03-11 17:04:59 +01:00
Laurent Destailleur
0219f11e64
Fix: Missing default value
2013-03-11 17:01:46 +01:00
Laurent Destailleur
e1bf659db5
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-03-11 16:49:37 +01:00
Laurent Destailleur
b0d7b33815
Merge pull request #715 from jfefe/extrafields
...
[ task #746 ] add extrafields support on propal object
2013-03-11 08:44:59 -07:00
Laurent Destailleur
5bc66318c2
New: use dolGetFirstLastname() everywher we should.
2013-03-11 15:54:01 +01:00
Grand Philippe
979a36e941
fix some translations
2013-03-11 15:18:24 +01:00
Laurent Destailleur
34fed3e430
No link if we renamed into another product
2013-03-11 15:06:40 +01:00
Grand Philippe
06e931632d
fix some translations
2013-03-11 14:51:48 +01:00
Laurent Destailleur
b4299ad583
Fix: Select of user
2013-03-11 14:51:19 +01:00
Laurent Destailleur
9eae775837
Merge remote-tracking branch 'origin/3.3' into develop
2013-03-11 14:35:08 +01:00
Laurent Destailleur
710ea872a9
Merge pull request #727 from cbattarel/3.3
...
fix wrong value name when updating buyingprice
2013-03-11 06:25:35 -07:00
Laurent Destailleur
633a15f10d
Fix: Usage of order into export broken when filters are used
2013-03-11 14:20:08 +01:00
Laurent Destailleur
5eb728ae43
Fix: Usage of order into export broken when filters are used
2013-03-11 14:09:54 +01:00
Grand Philippe
bb71b7ffed
fix some translations
2013-03-11 12:00:09 +01:00
Grand Philippe
02adc70667
fix some translations
2013-03-11 11:11:52 +01:00
Laurent Destailleur
6bc280ea7e
Test for some terminals
2013-03-11 10:18:25 +01:00
Laurent Destailleur
d8af59756d
New: Add function dolGetFirstLastname
2013-03-11 10:11:43 +01:00
Christophe Battarel
f620e6948f
fix wrong value name when updating buyingprice
2013-03-11 09:08:57 +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
Laurent Destailleur
42f857676c
Update example templates
2013-03-10 16:03:35 +01:00
Laurent Destailleur
02916825a6
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-03-10 15:37:29 +01:00
Laurent Destailleur
ae7ae7458a
Trans: Update turkish language files
2013-03-10 13:58:49 +01:00
simnandez
f79a26fe65
[ task #731 ] Uniformize ref generation. Interventions
...
[ task #748 ] Add a link "Dolibarr" into left menu
2013-03-10 13:58:32 +01:00
simnandez
92c1732b77
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop
2013-03-10 13:48:22 +01:00
Laurent Destailleur
64469a1d5c
Fix: doxygen
2013-03-10 13:24:08 +01:00
Laurent Destailleur
dbba8fd6ba
New: Can force picto path so an external module can use it with its own
...
picto
2013-03-10 13:23:55 +01:00
Laurent Destailleur
9b8a8351b4
Fix: Menu hidden
2013-03-10 13:22:51 +01:00
simnandez
c3f8939ede
[ task #748 ] Add a link "Dolibarr" into left menu
2013-03-10 13:11:31 +01:00
simnandez
ca0144d647
Trad: Add missing translations
2013-03-10 12:49:56 +01:00
simnandez
59cd4b7825
Trad: Add missing translations
2013-03-10 12:31:56 +01:00
Laurent Destailleur
746e005726
Fix: Fix ton of regression due to field name change
2013-03-09 20:34:38 +01:00
Laurent Destailleur
60f16e1a88
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/install/mysql/migration/3.3.0-3.4.0.sql
2013-03-09 19:06:53 +01:00
Laurent Destailleur
3e5ee3b00a
Fix: PHPUnit tests are back.
2013-03-09 18:55:57 +01:00
Laurent Destailleur
e03487f865
Merge pull request #724 from KreizIT/develop
...
Add trigger BILL_UNVALIDATE when invoice is unvalidate
2013-03-09 09:55:29 -08:00
Cedric GROSS
d16691c856
Add trigger BILL_UNVALIDATE when invoice is unvalidate
2013-03-09 17:38:35 +01:00
Laurent Destailleur
7bbbc32af9
Fix: Missing style and typo error
2013-03-09 17:08:19 +01:00
Laurent Destailleur
00f4e6ad85
Fix: Force format text of excel text fields
2013-03-09 16:58:55 +01:00
Laurent Destailleur
2c95b55682
Fix: Rename of fields
2013-03-09 16:37:50 +01:00
Laurent Destailleur
418eeef8b4
Fix: Ton of bugs into renaming fields
2013-03-09 16:19:15 +01:00
Laurent Destailleur
0f1741a06b
New: hooks for pdf_writelinedesc now implement the rule to overwrite or
...
not default code (http://wiki.dolibarr.org/index.php/Hooks_system )
2013-03-09 15:05:09 +01:00
Laurent Destailleur
01b2a6a79b
Prepare database for more localtax types.
2013-03-09 13:12:20 +01:00
Laurent Destailleur
72749bfc5f
Merge pull request #721 from frederic34/develop
...
Print IPP
2013-03-08 08:31:15 -08:00
Laurent Destailleur
0fe91796ef
New: [ task #696 ] Remove "new stdClass();" when possible
2013-03-08 15:52:23 +01:00
frederic34
18ff2fd198
Merge remote-tracking branch 'upstream/develop' into develop
2013-03-08 13:30:44 +01:00
Laurent Destailleur
e5f712fe14
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-03-08 12:09:49 +01:00
Laurent Destailleur
2a67af3c94
New: when adding an action, we can define a free code to tag it for
...
a specific need.
2013-03-08 12:04:01 +01:00
frederic34
89399121ba
Print IPP printing in "Fiche Commande"
2013-03-08 12:00:16 +01:00
frederic34
135de9ecdb
Print IPP
2013-03-08 11:54:32 +01:00
frederic34
2e03169acd
Print IPP icon display in formfile
2013-03-08 11:47:48 +01:00
frederic34
cdb1242bb5
Print IPP fix and printer icon
2013-03-08 11:38:30 +01:00
frederic34
16c5427366
Print IPP
2013-03-08 11:26:05 +01:00
frederic34
717ba46a5f
Print IPP lib
2013-03-08 11:17:46 +01:00
Laurent Destailleur
a6ce7bb428
Fix: Regression for negative proposal lines.
...
Conflicts:
htdocs/comm/propal.php
2013-03-08 10:28:25 +01:00
Laurent Destailleur
ffa2c2fb58
Oops, bad fix
2013-03-08 10:22:30 +01:00
Laurent Destailleur
f041a8a95e
Fix: Regression for negative proposal lines.
2013-03-08 10:06:23 +01:00
Laurent Destailleur
1e5c56642c
Fix: Some regression after renaming state and lastname.
2013-03-08 02:49:42 +01:00
Laurent Destailleur
c86f3ef4b4
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
htdocs/commande/fiche.php
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
2013-03-08 01:57:32 +01:00
Laurent Destailleur
44698fcde0
Fix: dol_is_dir may not be loaded, so call fails
2013-03-08 01:53:41 +01:00
Laurent Destailleur
b43fffafa9
Fix: Regression after renaming of fields
2013-03-08 01:31:45 +01:00
Laurent Destailleur
63e1b724cb
Merge pull request #718 from FHenry/3.3
...
Fix [ bug #753 ] cashdesk : Error message when adding product to basket
2013-03-07 14:24:13 -08:00
Laurent Destailleur
710585d4c2
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-03-07 22:40:12 +01:00
Laurent Destailleur
6cac84b222
Fix: Some fixes into reconciliate page
2013-03-07 22:39:57 +01:00
Laurent Destailleur
f62045e770
Merge pull request #720 from simnandez/develop
...
[ task #707 ] Create option ProfIdx are mandatory to validate a invoice
2013-03-07 10:58:13 -08:00
Laurent Destailleur
b060e5961b
Qual: Another step in men manager rewrite.
2013-03-07 19:47:03 +01:00
Laurent Destailleur
e97ca67c4a
Fix: Several problem with localtax into PDF generation
...
Conflicts:
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/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
2013-03-07 19:13:50 +01:00
Laurent Destailleur
668249a195
Fix: We must refresh object also if option MAIN_DISABLE_PDF_AUTOUPDATE
...
is 1 (Cyril ZEKSER)
2013-03-07 18:44:25 +01:00
simnandez
0c8d3336c2
[ task #707 ] Create option ProfIdx are mandatory to validate a invoice
2013-03-07 18:41:56 +01:00
Laurent Destailleur
c762c93eb1
Fix: Several problem with localtax into PDF generation
2013-03-07 12:04:12 +01:00
Laurent Destailleur
a0803e758e
Fix: Missing generic translation
2013-03-07 11:25:14 +01:00
Laurent Destailleur
3defd294cb
Merge remote-tracking branch 'origin/3.3' into develop
2013-03-07 11:08:15 +01:00
Laurent Destailleur
a3244a4b47
Fix: Missing genereic translation
2013-03-07 11:05:20 +01:00
fhenry
25fa2254c1
Fix [ bug #753 ] cashdesk : Error message when adding product to basket
...
https://doliforge.org/tracker/?func=detail&aid=753&group_id=144
http://www.dolibarr.fr/forum/526-autres-modules/39315-probleme-avec-point-de-vente
http://www.dolibarr.es/index.php/foro/6-icomo/2080-errores-con-tpv-y-tipos-de-iva
2013-03-07 10:50:02 +01:00
Laurent Destailleur
47ec826c17
New: Add link to check professional id for india.
2013-03-07 10:47:05 +01:00
jfefe
fcd81e47eb
Use price2num() function instead of price() to use calcul in ODT.
...
Libre/Open Office wants number with dot and no space to allow make calcul in ODT document
2013-03-07 03:43:23 +01:00
jfefe
289e2e7888
New function to fill ODT substitution array with extrafield of object
2013-03-07 03:27:28 +01:00
jfefe
65ed01a251
Extrafields on ODT (propal) : fix value of price with currency & display date with correct format
2013-03-07 03:27:20 +01:00
jfefe
ac3116930c
Add value to store price type extrafield without currency in ODT
2013-03-07 03:27:08 +01:00
jfefe
06807ce198
Fix : select correct value of extrafield (select list)
2013-03-07 02:13:21 +01:00
jfefe
1690c77aa2
Merge branch 'extra_invoice' into extrafields
...
Conflicts:
htdocs/install/mysql/migration/3.3.0-3.4.0.sql
2013-03-07 01:48:27 +01:00
eldy
6c2841d4d6
New: Type of fields are received by export format handlers
2013-03-06 22:28:15 +01:00
eldy
9d047d740b
Fix: no null into not null field
2013-03-06 21:30:37 +01:00
eldy
e74b07cbff
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/install/mysql/migration/3.3.0-3.4.0.sql
2013-03-06 21:28:50 +01:00
eldy
9b8dd94751
Fix: no null into not null field
2013-03-06 21:26:05 +01:00
eldy
05c6706727
Fix: error with pgsql
2013-03-06 20:08:38 +01:00
Laurent Destailleur
1f0dbc698c
Merge pull request #714 from FHenry/3.3
...
fix [ bug #749 ]
2013-03-06 10:33:51 -08:00
Laurent Destailleur
b9bb0f9857
Merge pull request #716 from grandoc/develop
...
fix : deprecated
2013-03-06 10:30:58 -08:00
Laurent Destailleur
cdc355fea0
Fix: Missing hookmanager
2013-03-06 17:21:51 +01:00
Grand Philippe
a080021511
fix : deprecated
2013-03-06 17:17:34 +01:00
Laurent Destailleur
baf6ccf654
New: Can define of we want to use VAT or not for subscriptions
...
(foundation module).
New: Can define a default choice for choice "More action when
recording a subscription" (foundation module).
2013-03-06 17:16:26 +01:00
Grand Philippe
b6581c2b26
fix : deprecated
2013-03-06 16:38:15 +01:00
Laurent Destailleur
0fc17069c8
Translation
2013-03-06 16:11:20 +01:00
Laurent Destailleur
d92fd0eaed
New: Add table, dictionnary and option to enable "revenue stamp".
2013-03-06 16:09:00 +01:00
Laurent Destailleur
0bfa968a3f
New: Add field to store revenue stamp
2013-03-06 15:44:06 +01:00
Laurent Destailleur
b56723d600
Fix: Avoid wrapping
2013-03-06 10:06:54 +01:00
jfefe
04617d0eb3
Show extrafields for object into invoice ODT document
2013-03-06 05:33:00 +01:00
jfefe
dc1314f4f4
Retreive extrafield when fetch invoice
2013-03-06 05:31:19 +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
jfefe
4314d4c7fe
Add admin screen for extrafields on customer invoices
2013-03-06 03:50:41 +01:00
jfefe
88a042ec41
Prepare invoice admin page to add extrafield support
2013-03-06 03:36:43 +01:00
jfefe
49f1ef173a
Add table for invoice extrafields
2013-03-06 03:17:38 +01:00
jfefe
7d3c35fb90
Merge branch 'extra_propal' into extrafields
2013-03-06 01:41:47 +01:00
jfefe
8b749eaafc
Fix : extrafields are not saved on update (propale)
2013-03-06 01:34:32 +01:00
jfefe
61127e82f6
User must have write permission to edit extrafields on propale
2013-03-06 01:33:55 +01:00
Laurent Destailleur
9bced140e6
More explanation onto the php session parameter.
2013-03-06 00:45:43 +01:00
jfefe
9eee5f9509
Fix : extrafields for propale were note saved after creation
2013-03-06 00:18:41 +01:00
jfefe
9877466594
Add information about linked proposal into basic ODT template for invoice
2013-03-06 00:03:24 +01:00
jfefe
55bfdd341d
Fix : change to variable with unused name
2013-03-05 23:51:42 +01:00
jfefe
bd229a9417
Add param to define key name in return array of substitution function
...
for propal
2013-03-05 22:23:57 +01:00
jfefe
3cefb62621
Fix : incorrect function used to retrieve extrafields for propal
2013-03-05 22:22:10 +01:00
jfefe
9e612696f2
Add help about extrafields in ODT propal
2013-03-05 21:51:33 +01:00
fhenry
617a71478b
fix [ bug #749 ]
2013-03-05 19:05:12 +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
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
Laurent Destailleur
c11f7dfc71
Next step for rewriting menu managers.
2013-03-05 15:42:26 +01:00
jfefe
5ce11d00dd
Display linked propal information into invoice ODT
2013-03-05 15:11:51 +01:00
Laurent Destailleur
de6d40237d
Fix: No syntax error when when want no limit
2013-03-05 13:28:31 +01:00
Laurent Destailleur
ae2355fda5
Merge branch '3.3' of https://github.com/Dolibarr/dolibarr.git into 3.3
2013-03-05 12:54:37 +01:00
JF FERRY
ff2a851ae8
Move substitution function for propal to common class & add extrafields display
2013-03-05 08:38:41 +01:00
Laurent Destailleur
215731dc59
Fix bug
2013-03-05 00:14:04 +01:00
Laurent Destailleur
b036120c70
Labels
2013-03-04 23:56:17 +01:00
Laurent Destailleur
555b3a1199
Fix:; Removed warning
2013-03-04 21:00:22 +01:00
jfefe
59627408c0
Edit extrafields on propal
2013-03-04 19:17:11 +01:00
jfefe
f335c4f306
New : add extrafield support on propal object
2013-03-04 18:22:25 +01:00
Laurent Destailleur
f86cad0580
Fix: Try a fix for IE9 (need to be tested with IE 8, 7 and 10)
2013-03-04 17:36:20 +01:00
fhenry
c29602382d
Taking account remark on pull request da17302
2013-03-04 16:59:39 +01:00
fhenry
f793ed83f6
Fix [ bug #747 ]
2013-03-04 15:36:40 +01:00
fhenry
da17302349
[ task #743 ] GED : Add aministration option to disabled autotree to
...
display
2013-03-04 11:16:46 +01:00
Laurent Destailleur
ae1e0dff87
Merge pull request #710 from FHenry/3.3
...
Fix [ bug #742 ]
2013-03-03 15:26:50 -08:00
Laurent Destailleur
931b556b69
Fix: sql error
2013-03-04 00:01:38 +01:00
fhenry
b0212fc8e6
Fix [ bug #742 ]
...
and translation of constant description
2013-03-03 21:23:18 +01:00
Laurent Destailleur
737752e36c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
2013-03-03 00:10:36 +01:00
Laurent Destailleur
248c75a7b2
Look: Minor fix
2013-03-03 00:00:38 +01:00
simnandez
a811121daf
[ task #731 ] Uniformize ref generation
2013-03-02 16:50:36 +01:00
Laurent Destailleur
fc46a02573
Fix: Uniformize field type
2013-03-02 16:39:26 +01:00
Laurent Destailleur
51d23d7c48
Merge fix of 3.3
2013-03-02 16:17:12 +01:00
Laurent Destailleur
924d01249c
Prepare 3.3.1 maintenance release
2013-03-02 16:12:06 +01:00
Laurent Destailleur
6f51925c7b
Merge pull request #708 from simnandez/develop
...
[ task #731 ] Uniformize ref generation. Propals
2013-03-02 07:06:53 -08:00
Laurent Destailleur
0f576181be
Merge pull request #707 from simnandez/3.3
...
Fix: Localtax2 for Spain must be based into buyer
2013-03-02 07:05:50 -08:00
Laurent Destailleur
862c56a118
Merge pull request #704 from GPCsolutions/develop-noutf8bom_includes
...
Removed UTF-8 BOM from included libraries
2013-03-02 07:05:13 -08:00
Laurent Destailleur
6b3b2ea1c7
Merge pull request #706 from atm-maxime/develop
...
Bug on contact list
2013-03-02 07:04:41 -08:00
Laurent Destailleur
81a06507fa
Fix: data not refreshed
2013-03-02 16:01:46 +01:00
simnandez
7d9d575e40
[ task #731 ] Uniformize ref generation. Propals
2013-03-02 15:57:26 +01:00
Laurent Destailleur
f172c900c7
Qual: Uniformize menu code
2013-03-02 14:43:36 +01:00
Laurent Destailleur
f464b7b37c
Fix: Avoid using date_format
2013-03-01 23:30:07 +01:00
Laurent Destailleur
5fb4ec7891
Fix: bad field name
2013-03-01 23:14:28 +01:00
simnandez
0cb5b3f50c
Fix: Localtax2 for Spain must be based into buyer
2013-03-01 20:32:49 +01:00
Laurent Destailleur
e6afcd328c
Look: Minor fix in CSS for IE.
2013-03-01 19:39:54 +01:00
Laurent Destailleur
911c25c3fd
Qual: Better error management
2013-03-01 19:25:49 +01:00
Maxime Kohlhaas
da87828200
Fix bug # 740 : address copy
2013-03-01 18:41:41 +01:00
Maxime Kohlhaas
803bee076c
Engish standardization correction + search by idprof1 possible
2013-03-01 18:20:42 +01:00
Laurent Destailleur
3022dff108
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-03-01 18:14:42 +01:00
Maxime Kohlhaas
881b3bc936
Bug fix on contact list due to name column renamed
2013-03-01 18:11:34 +01:00
Laurent Destailleur
562ea22304
Qual: Better error management
2013-03-01 18:10:19 +01:00
Laurent Destailleur
29ccc749ae
Merge pull request #703 from GPCsolutions/develop-noutf8bom_main
...
Removed UTF-8 BOM
2013-03-01 07:23:17 -08:00
Raphaël Doursenaud
a6407a3642
Removed UTF-8 BOM from included libraries
2013-03-01 14:17:36 +01:00
Raphaël Doursenaud
e76ffca9ba
Removed UTF-8 BOM
2013-03-01 14:11:42 +01:00
Laurent Destailleur
a1b4d670ff
Merge pull request #701 from defrance69/patch-14
...
Update index.php
2013-03-01 03:48:54 -08:00
Alexis Algoud
49f712546f
Add condition for normal traitment on empty hook result.
...
Note : The normal case on 'formObjectOptions' is currently nothing more (no extrafields,...).
2013-03-01 11:38:24 +01:00
Alexis Algoud
2d36423310
Ajout de la gestion des Hooks (doActions & sur la page d'ajout des commerciaux à une société, /societe/commerciaux.php
2013-03-01 10:42:05 +01:00
BENKE Charles
5ad98a8652
Update index.php
...
rename search_product by search_project (the real search thing)
2013-03-01 00:56:29 +01:00
eldy
4e52b2596a
Uniformize code
2013-02-28 23:49:38 +01:00
fhenry
0d0c1e8c14
Fix [ bug #736 ]
2013-02-28 21:18:52 +01:00
fhenry
7952a1f1a5
rool back changes
2013-02-28 21:15:45 +01:00
fhenry
dcf76d7bcb
Fix [ bug #736 ]
2013-02-28 21:13:25 +01:00
Regis Houssin
16ad99f8c5
Fix: to force id field name
2013-02-28 19:41:44 +01:00
Regis Houssin
d9b7886ef9
Fix: try to fix regression, stored the last id created in a session
...
variable in order to be used to find out information in the "ref_ext" in
order to differentiate automatic actions.
2013-02-28 18:47:38 +01:00
Laurent Destailleur
1d76b3153e
Start to work onto payment return
2013-02-28 17:37:07 +01:00
Laurent Destailleur
7bbbda2dce
New: dol_syslog method accept a suffix to use different log files for
...
log.
2013-02-28 16:19:16 +01:00
Laurent Destailleur
fd6b51413c
Civility not required in a short label
2013-02-28 15:37:53 +01:00
Laurent Destailleur
33feddcd32
Qual: Rewrite of menu manager. next step.
2013-02-27 21:40:43 +01:00
Laurent Destailleur
b9848702a8
Merge remote-tracking branch 'origin/3.3' into develop
2013-02-27 19:44:22 +01:00
Laurent Destailleur
d190e924b3
Fix: Update of type was not working.
2013-02-27 19:43:40 +01:00
Laurent Destailleur
8b244b0d61
Fix: select lost if error
2013-02-27 19:21:40 +01:00
Laurent Destailleur
47c89dfd8e
Fix: trans
2013-02-27 17:47:51 +01:00
Laurent Destailleur
0d94ec4fee
Fix: trans
2013-02-27 17:47:21 +01:00
Laurent Destailleur
f2371be191
Fix: Update button does not appear
2013-02-27 15:24:08 +01:00
Laurent Destailleur
f294ea5fb0
Fix: Update button does not appear
2013-02-27 15:23:25 +01:00
Grand Philippe
44683a0e21
english language standardization
2013-02-27 11:58:50 +01:00
Grand Philippe
6fb6b916c7
english language standardization
2013-02-27 11:24:50 +01:00
Laurent Destailleur
283aeb2945
Fix: Add option MAIN_USE_LOCALTAX_TYPE_7 to hide localtax 7 because
...
type 7 need to be implemented at invoice level, not line level. This
disable the feature (we need better implementation) without removing it
for people using it in the past.
2013-02-27 01:06:08 +01:00
Laurent Destailleur
61d5bd9962
css
2013-02-27 01:05:30 +01:00
Laurent Destailleur
029dec126d
Fix: Add option MAIN_USE_LOCALTAX_TYPE_7 to hide localtax 7 because
...
type 7 need to be implemented at invoice level, not line level. This
disable the feature (we need better implementation) without removing it
for people using it in the past.
2013-02-27 01:05:16 +01:00
Laurent Destailleur
6f0c35ef61
Fix: Bad migration instruct
2013-02-26 22:57:01 +01:00
Laurent Destailleur
453539511a
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-02-26 21:36:18 +01:00
Laurent Destailleur
bdcb6bdef5
Try to aplpy enhancements defined into
...
http://www.dolibarr.fr/forum/527-bugs-sur-la-version-stable-courante/38958-resolu-probleme-exports#38968
2013-02-26 20:15:20 +01:00
Laurent Destailleur
6692c1072a
Merge pull request #696 from jfefe/develop
...
Fix : bad sql request for cp field
2013-02-26 11:07:16 -08:00
Laurent Destailleur
402fe2e417
Merge remote-tracking branch 'origin/3.3' into develop
2013-02-26 20:05:23 +01:00
Laurent Destailleur
18aff92366
Merge pull request #683 from FHenry/3.3
...
Fix [ bug #733 ]
2013-02-26 11:03:36 -08:00
Laurent Destailleur
dacba745c5
Merge pull request #694 from grandoc/develop
...
english language standardization
2013-02-26 11:03:16 -08:00
Laurent Destailleur
b8a330ee80
Merge pull request #693 from atm-maxime/develop
...
LDAP : update user sync + add groups sync and users associated to group ...
2013-02-26 11:02:43 -08:00
Grand Philippe
d8edb3c074
display enhancement for models
2013-02-26 17:41:08 +01:00
Maxime Kohlhaas
0de4fa09f1
Product price : updated always with HT base type after product import
2013-02-26 12:52:37 +01:00
jfefe
428ba7feaf
Fix : bad sql request for cp field
2013-02-26 12:41:52 +01:00
Maxime Kohlhaas
e208bdf881
Theme : amarok was missing favicon, put eldy's one in place, to be replaced by a specific favicon
2013-02-26 12:05:55 +01:00
Maxime Kohlhaas
3d814c58e5
Bug # 736 : incorrect table name in migration script, muse be done in 3.3 branch too
2013-02-26 09:28:56 +01:00
philippe
905d6f7b71
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop
2013-02-26 08:22:48 +01:00
Laurent Destailleur
4fd8143ecc
Merge remote-tracking branch 'origin/3.3' into develop
2013-02-25 20:24:34 +01:00
Laurent Destailleur
c4948ea3db
Fix: It seems foreign key is not deleted sometimes. To be sure, we force
...
delete also at end.
2013-02-25 20:23:44 +01:00
Laurent Destailleur
e776e849ce
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-02-25 20:17:56 +01:00
Laurent Destailleur
c44f6004dd
Doc
2013-02-25 20:17:41 +01:00
Grand Philippe
44dee53350
english language standardization
2013-02-25 18:21:12 +01:00
Grand Philippe
79c2e17cbb
english language standardization
2013-02-25 17:56:41 +01:00
Maxime Kohlhaas
cd5bda27f4
Supplier dispatch : add new trigger called after order is dispatched
2013-02-25 16:56:37 +01:00
Maxime Kohlhaas
1eddf95d95
LDAP : update user sync + add groups sync and users associated to group + add fetch by name on group class
2013-02-25 16:46:31 +01:00
Laurent Destailleur
43a248b88b
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop
Conflicts:
ChangeLog
2013-02-25 13:01:56 +01:00
Laurent Destailleur
2dc4b91521
New: Function plimit of databases drivers accept -1 as value (it means
...
default value set into conf->liste_limit).
2013-02-25 12:51:38 +01:00
Maxime Kohlhaas
428f844b4d
LDAP : add option to get data as an array
2013-02-25 11:57:52 +01:00
Maxime Kohlhaas
cfa1a41a16
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
2013-02-25 11:54:26 +01:00
Laurent Destailleur
b9ead08968
Merge pull request #691 from grandoc/develop
...
english language standardization
2013-02-25 01:32:26 -08:00
Laurent Destailleur
e748f07806
Qual: Using divs instead of tables
2013-02-25 10:31:47 +01:00
Grand Philippe
ffeb066b1b
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop
2013-02-25 10:30:48 +01:00
Laurent Destailleur
ae322ba17f
Qual: Better init of default lang
2013-02-25 10:17:38 +01:00
Grand Philippe
eddf910438
fix issue with english language standardization
2013-02-25 10:00:09 +01:00
Grand Philippe
b081589129
english language standardization
2013-02-25 09:52:24 +01:00
Grand Philippe
6decab1847
english language standardization
2013-02-25 09:17:38 +01:00
Grand Philippe
d27568d3d0
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop
2013-02-25 08:16:43 +01:00
Laurent Destailleur
b61c576343
Qual: Still work onto menu management rewrite.
2013-02-24 21:16:36 +01:00
Laurent Destailleur
7238c5156e
New: Update jquery mobile lib
2013-02-24 19:33:06 +01:00
Laurent Destailleur
b4329cb5d2
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-02-24 18:22:57 +01:00
Laurent Destailleur
24eab5b8fd
New: Add page with seach only boxes.
2013-02-24 18:22:28 +01:00
Laurent Destailleur
234e171e9d
New: Add option dol_hide_topmenu and dol_hide_leftmenu onto login page.
2013-02-24 18:16:26 +01:00
Laurent Destailleur
fe4ef69360
Fix: Duplicate form
2013-02-24 18:08:52 +01:00
Laurent Destailleur
a6378ab0bb
Cleaner HTML code
2013-02-24 18:08:27 +01:00
Grand Philippe
cb28300d7e
fix error commit
2013-02-24 17:17:25 +01:00
philippe
43b01010d1
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop
2013-02-24 17:09:12 +01:00
Grand Philippe
86de772b31
english language standardization
2013-02-24 17:08:52 +01:00
Laurent Destailleur
7aca87ea40
Merge pull request #690 from frederic34/develop
...
WIP : Carrier Admin sql data migration
2013-02-24 07:45:44 -08:00
Grand Philippe
dfae543d5e
english language standardization
2013-02-24 15:57:02 +01:00
Grand Philippe
8c765ace99
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop
2013-02-24 15:30:39 +01:00
Laurent Destailleur
3baf8a6c00
New: Use div instead of tables into login page.
2013-02-24 14:57:49 +01:00
Laurent Destailleur
6b20370ffa
Fix: Check consitency of option NOREQUIREXXX
2013-02-24 14:54:08 +01:00
Grand Philippe
7596096b89
some fix for english language standardization
2013-02-24 14:46:00 +01:00
Grand Philippe
067cb0a409
some fix for english language standardization
2013-02-24 14:32:15 +01:00
Grand Philippe
36ce7a9a10
some fix for english language standardization
2013-02-24 14:11:09 +01:00
Laurent Destailleur
0b61c740a9
Fix: To be sure to start onto an selected top menu
2013-02-24 13:57:17 +01:00
Grand Philippe
77544de01a
some fix for english language standardization
2013-02-24 12:50:05 +01:00
Grand Philippe
5d3ab26463
some fix for english language standardization
2013-02-24 12:26:01 +01:00
Grand Philippe
9175f241ff
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop
2013-02-24 10:10:52 +01:00
Laurent Destailleur
08bde6faa5
Fix: Do not load menu when not required.
2013-02-24 03:45:19 +01:00
Laurent Destailleur
50de5a944a
Fix: compatibility with new menu manager
2013-02-24 03:29:03 +01:00
Laurent Destailleur
d3c2d088a9
New: Add url to get menu only. Work on progress.
2013-02-24 02:55:25 +01:00
Laurent Destailleur
cd56fa61e6
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-02-24 02:47:47 +01:00
Laurent Destailleur
d31306609c
Fix: Bad translation if error
2013-02-24 02:47:30 +01:00
Laurent Destailleur
d786e8ca6e
Code comment
2013-02-24 02:42:37 +01:00
Laurent Destailleur
c62f87380c
Qual: use div instead of table
2013-02-24 02:41:46 +01:00
Grand Philippe
6adc9eb7f2
english language standardization
2013-02-23 17:40:28 +01:00
Grand Philippe
c9f91a6082
english language standardization
2013-02-23 17:01:10 +01:00
frederic34
2a2719d5eb
WIP : Carrier Admin sql data migration
2013-02-23 16:54:41 +01:00
Laurent Destailleur
4dbf5a20ad
Merge pull request #687 from frederic34/develop
...
WIP : Admin for Carriers
2013-02-23 07:38:55 -08:00
Grand Philippe
4f9f32eb3e
english language standardization
2013-02-23 16:37:17 +01:00
Grand Philippe
ac0e99bc1a
english language standardization
2013-02-23 16:21:49 +01:00
Grand Philippe
048035a05b
english language standardization
2013-02-23 16:08:35 +01:00
Grand Philippe
382d216d54
english language standardization
2013-02-23 15:58:26 +01:00
Grand Philippe
8d7654916f
english language standardization
2013-02-23 15:46:12 +01:00
Grand Philippe
b699b79a15
english language standardization
2013-02-23 15:36:12 +01:00
Grand Philippe
f862adc4d9
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop
2013-02-23 15:27:06 +01:00
Grand Philippe
a237be0d24
english language standardization
2013-02-23 15:26:39 +01:00
frederic34
9333fdb97f
WIP : Admin for Carriers
2013-02-23 15:23:33 +01:00
Grand Philippe
37cce5d860
fix: change name with lastname
2013-02-23 14:31:59 +01:00
Grand Philippe
5d8dea788c
fix: change name with lastname
2013-02-23 14:17:52 +01:00
Grand Philippe
9fc18d23e7
fix: change name with lastname
2013-02-23 13:59:17 +01:00
Grand Philippe
7c2a4500d6
fix: change name with lastname
2013-02-23 12:30:01 +01:00
Laurent Destailleur
37b94e43c8
Merge pull request #685 from frederic34/develop
...
WIP : Admin for Carriers
2013-02-23 03:11:52 -08:00
Laurent Destailleur
bbe145cc47
Merge pull request #681 from grandoc/develop
...
english standardization
2013-02-23 03:08:56 -08:00
Laurent Destailleur
845e4ff93d
Merge pull request #684 from jfefe/develop
...
Fix bug #732 : Missing argument when calling selectcontacts method
2013-02-23 02:55:46 -08:00
Grand Philippe
15f8b588d6
english standardization
2013-02-23 11:54:46 +01:00
Grand Philippe
869a014d32
english standardization
2013-02-23 11:42:12 +01:00
Grand Philippe
250a941096
english standardization
2013-02-23 11:11:33 +01:00
Grand Philippe
529b8ae38e
english standardization
2013-02-23 10:43:16 +01:00
Grand Philippe
9400d9897a
english standardization
2013-02-23 10:35:46 +01:00
frederic34
c8872d7e98
WIP : Admin for carriers
2013-02-23 10:20:31 +01:00
Grand Philippe
88458ca466
english standardization
2013-02-23 10:18:05 +01:00
Grand Philippe
182fdbce32
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop
2013-02-23 10:04:31 +01:00
Laurent Destailleur
1224e79ee3
Qual: Start to clean how menu managers works.
2013-02-22 19:16:03 +01:00
Grand Philippe
c88f2bcb45
english standardization
2013-02-22 17:43:33 +01:00
Grand Philippe
57a75d9882
english standardization
2013-02-22 17:15:49 +01:00
Grand Philippe
a0df6764d8
english standardization
2013-02-22 17:13:11 +01:00
Grand Philippe
844433d0a2
english standardization
2013-02-22 17:11:53 +01:00
Grand Philippe
fb54bceafb
english standardization
2013-02-22 16:53:50 +01:00
Grand Philippe
9a431bb8e3
english standardization
2013-02-22 16:33:48 +01:00
Grand Philippe
890b9ca44a
english standardization
2013-02-22 16:27:58 +01:00
Grand Philippe
aa28e17953
english standardization
2013-02-22 16:21:30 +01:00
Grand Philippe
38480f5962
english standardization
2013-02-22 16:19:16 +01:00
Grand Philippe
a582fd3f15
english standardization
2013-02-22 16:14:52 +01:00
jfefe
7e79e1a574
Fix bug #735 : Error when trying send expedition card
2013-02-22 16:02:19 +01:00
Grand Philippe
fc4ad12a72
english standardization
2013-02-22 15:57:30 +01:00
jfefe
34bfdf92cd
Fix bug #732 : Missing argument when calling selectcontacts method
2013-02-22 15:34:20 +01:00
Maxime Kohlhaas
04e1be4afd
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
2013-02-22 15:24:49 +01:00
Maxime Kohlhaas
87dc3a0b22
LDAP sync : trigger was launched even if LDAP_SYNCHRO_ACTIVE is 'ldap2dolibarr'
2013-02-22 15:24:29 +01:00
fhenry
af6bb94ff3
Merge branch '3.3' of https://github.com/Dolibarr/dolibarr.git into 3.3
2013-02-22 15:02:33 +01:00
fhenry
44b5b98308
Fix [ bug #733 ]
2013-02-22 15:02:06 +01:00
Laurent Destailleur
8c4e13230b
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-02-22 14:20:46 +01:00
frederic34
67c06225a5
WIP : Admin for carriers
2013-02-22 14:18:51 +01:00
philippe
b4e43bbc41
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop
2013-02-22 13:58:19 +01:00
Regis Houssin
ae154ed9a3
Merge branch '3.3' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.3
2013-02-22 13:15:41 +01:00
Regis Houssin
b5d2a378fa
Fix: pdf models are unstable and time consuming.
2013-02-22 13:14:54 +01:00
Regis Houssin
7d0f02eb8b
Fix: pdf models are unstable and time consuming.
2013-02-22 13:14:04 +01:00
Laurent Destailleur
a1b05f8be4
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-02-22 13:02:15 +01:00
Laurent Destailleur
6b50ddf6ec
Merge pull request #682 from FHenry/3.3
...
Fix bug #730
2013-02-22 03:45:32 -08:00
Regis Houssin
8a5f68de9c
Fix: wrong hidden
2013-02-22 12:22:28 +01:00
Regis Houssin
dd7411593e
Fix: wrong hidden
2013-02-22 12:21:49 +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
Grand Philippe
960c9ccbaf
english standardization
2013-02-22 11:39:47 +01:00
Grand Philippe
19201a1015
english standardization
2013-02-22 11:32:19 +01:00
philippe
fae9f73ea4
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop
2013-02-22 11:31:52 +01:00
Regis Houssin
3b45cffafa
Fix: hide blocs with multi-page
2013-02-22 11:26:23 +01:00
Regis Houssin
8136244d87
Fix: hide blocs with multi-page
2013-02-22 11:25:29 +01:00
Regis Houssin
20522148f2
Fix: regression, the product discount overwrites the default customer
...
discount !
2013-02-22 11:06:45 +01:00
Regis Houssin
289ff4fe1a
Fix: regression, the product discount overwrites the default customer
...
discount !
2013-02-22 11:03:20 +01:00
Grand Philippe
d255dc5114
english standardization
2013-02-22 10:24:24 +01:00
fhenry
aa473fa3e3
Fix bug #730
2013-02-22 09:42:02 +01:00
Grand Philippe
d229d3a594
english standardization
2013-02-22 09:41:56 +01:00
Grand Philippe
303577a7fa
english standardization
2013-02-22 09:36:01 +01:00
Grand Philippe
0af5c434af
english standardization
2013-02-22 09:29:34 +01:00
frederic34
751488e291
Merge remote-tracking branch 'upstream/develop' into develop
2013-02-22 09:01:27 +01:00
simnandez
e1683f5f22
Fix: Pagination at bottom not work correctly with filters applied
2013-02-22 08:57:28 +01:00
frederic34
de4bc7f39d
Fix : It was a bad idea to add COL in the code name of new carriers
2013-02-22 08:56:14 +01:00
simnandez
8fd3d9375d
Fix: Pagination at bottom not work correctly with filters applied
2013-02-22 08:56:07 +01:00
eldy
4f1c4f0365
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-02-22 00:11:47 +01:00
eldy
2ecb113d30
Fix: categories are set onto category tab
2013-02-22 00:11:34 +01:00
frederic34
d26024d8fc
WIP : Admin for Carriers (Activate/Desactivate)
2013-02-21 23:40:25 +01:00
frederic34
6259f4ce59
Fix : some & -> &
2013-02-21 23:08:58 +01:00
Laurent Destailleur
4a8883dc92
Merge pull request #678 from atm-maxime/develop
...
Supplier order : add trigger on product dispatch
2013-02-21 12:44:43 -08:00
Laurent Destailleur
0aa24369fd
Merge pull request #676 from frederic34/develop
...
New: Add some carrier
2013-02-21 12:44:30 -08:00
Laurent Destailleur
3053319928
Merge pull request #675 from grandoc/develop
...
fix : english normalization
2013-02-21 12:40:15 -08:00
Laurent Destailleur
c24b29343a
Merge pull request #674 from simnandez/develop
...
Qual: Try to delete no more used addpropal.php
2013-02-21 12:39:47 -08:00
eldy
e99b0dd96f
Fix: Select prospect, customer or both
2013-02-21 21:11:21 +01:00
eldy
3d80a6ebfc
Fix: Enhance pgsql driver
2013-02-21 21:04:20 +01:00
simnandez
5d357c7736
Trad: Fix activity box translation
2013-02-21 18:48:56 +01:00
simnandez
8e6cde61c0
Trad: Update translations
2013-02-21 18:44:11 +01:00
Maxime Kohlhaas
2f5bf06aed
Supplier order : add trigger on product dispatch
2013-02-21 17:32:57 +01:00
simnandez
723c46ec42
Fix: Pagination at bottom not work correctly with filters applied
2013-02-21 14:29:06 +01:00
frederic34
d7f83c3520
New: Add some carrier
2013-02-21 11:23:12 +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
ec3dab23ca
Fix: Page title
2013-02-21 10:22:33 +01:00
simnandez
c03f346c6d
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop
2013-02-21 10:12:05 +01:00
Grand Philippe
dc4c013d10
fix : english normalization
2013-02-21 09:44:49 +01:00
Grand Philippe
9d28a1de75
fix : english normalization
2013-02-21 09:35:05 +01:00
Laurent Destailleur
66ca0ba0e2
Fix: alignement
2013-02-20 21:58:13 +01:00
Laurent Destailleur
3687b29a7b
Fix: Missing translation
2013-02-20 21:42:20 +01:00
Laurent Destailleur
af26c4ce6d
Fix: Missing translation
2013-02-20 21:41:50 +01:00
Laurent Destailleur
2852aded3a
New: Add button collapse/expand for menu, category and user views.
2013-02-20 21:16:31 +01:00
Laurent Destailleur
320b4bde1f
Qual: Code to output tree is now generic
2013-02-20 19:01:29 +01:00
Laurent Destailleur
6db881c09d
New: Add link collapse all - expand all.
...
Fix: Add missing images.
2013-02-20 18:34:54 +01:00
simnandez
b913d186bd
Qual: Try to delete no more used addpropal.php
2013-02-20 18:32:14 +01:00
Laurent Destailleur
2017815e89
Fix: Works for both normalized modules and external modules
2013-02-20 17:34:03 +01:00
Laurent Destailleur
1aee361ffd
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-02-20 14:58:56 +01:00
Laurent Destailleur
f194ee5363
Fix: core dir of external modules must be into dir of module.
2013-02-20 14:58:40 +01:00
Laurent Destailleur
e5e4c113a3
Merge pull request #672 from jfefe/extrafields
...
Fix : extrafields value in ODT document
2013-02-20 03:05:54 -08:00
jfefe
4bf550b25c
Fix : bad permission in webservice to get contact
2013-02-20 11:37:44 +01:00
jfefe
1941efa45a
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into webservices
2013-02-20 11:15:15 +01:00
jfefe
cb0404a750
New webservice method to update contact
2013-02-20 11:15:05 +01:00
Laurent Destailleur
3c18696f7e
Removed deprecated code
2013-02-20 10:37:52 +01:00
Laurent Destailleur
b40f1a5261
Merge pull request #670 from frederic34/develop
...
language fix
2013-02-19 12:11:23 -08:00
Laurent Destailleur
d07c5ae49f
Merge pull request #669 from simnandez/develop
...
Fix: Translation
2013-02-19 12:11:06 -08:00
Laurent Destailleur
bc505c98a0
Test to avoid infinite loop
2013-02-19 21:10:31 +01:00
Laurent Destailleur
9ddd6215f8
Qual: Replace native code with jquery plugin treeview.
2013-02-19 20:15:30 +01:00
frederic34
da6daef83b
fix language holiday admin
2013-02-19 16:36:25 +01:00
frederic34
8c0fbe62f5
fix language holiday
2013-02-19 16:30:51 +01:00
simnandez
94d1f6e0c2
Fix: sourcecompany now works with state instead departement (deprecated)
...
into build_address
2013-02-19 16:05:55 +01:00
simnandez
9e3497cff3
New: Add ES formated address country rule
2013-02-19 16:02:58 +01:00
Laurent Destailleur
46170c0255
New: Focus on first field
2013-02-19 15:33:49 +01:00
Laurent Destailleur
95098a9b59
Fix: Menu editor
2013-02-19 15:23:25 +01:00
Laurent Destailleur
7367a2472c
Look: Mor CSS3
2013-02-19 13:24:32 +01:00
simnandez
df0f281efd
Fix: Translation
2013-02-19 12:11:44 +01:00
Laurent Destailleur
3912013a05
Merge pull request #668 from FHenry/develop
...
Better to use foreach because when add mail in $cible array we can test
2013-02-19 01:14:23 -08:00
Laurent Destailleur
402bc48b24
Merge pull request #666 from grandoc/3.3
...
fix language
2013-02-19 01:13:00 -08:00
fhenry
3e42f90b1e
Better to use foreach because when add mail in $cible array we can test
...
with (!array_key_exists($obj->email, $cibles)) better than old method
2013-02-19 04:48:39 +01:00
simnandez
15f6f7c335
Fix: Translation
2013-02-18 17:07:20 +01:00
Grand Philippe
3ce75ce382
fix: bad commit
2013-02-18 16:57:38 +01:00
Laurent Destailleur
4119fde0e5
Merge pull request #665 from FHenry/develop
...
Fix mass mailing tabs regression
2013-02-18 07:46:07 -08:00
Grand Philippe
108b4d1ae9
fix language
2013-02-18 16:10:27 +01:00
jfefe
a197e6a026
Merge branch 'extra_odt' into extrafields
2013-02-18 15:50:47 +01:00
jfefe
110713f6ca
Fix : display correct value in ODT for extrafields
2013-02-18 15:47:40 +01:00
fhenry
195af1f2bd
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-02-18 15:25:27 +01:00
fhenry
fd4a465c90
Fix mass maling tabs regression
2013-02-18 15:25:13 +01:00
Laurent Destailleur
e9dc4b9db3
Fix: We must not add month holidays after init of sold.
2013-02-18 15:15:10 +01:00
Laurent Destailleur
da7b5e352f
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
htdocs/langs/fr_FR/admin.lang
New: Add function dol_set_focus('#xxx')
2013-02-18 15:01:00 +01:00
Grand Philippe
b484fef22a
fix language
2013-02-18 14:19:01 +01:00
Laurent Destailleur
70ea5b0b1d
Merge pull request #663 from jfefe/extrafields
...
Work on extrafields
2013-02-18 05:17:06 -08:00
Laurent Destailleur
b5260e4ab1
Fix: Translation
2013-02-18 14:13:02 +01:00
Grand Philippe
020dff3699
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop
2013-02-18 13:48:11 +01:00
Grand Philippe
0a697e1033
fix language
2013-02-18 13:47:46 +01:00
jfefe
2f4a80215b
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into extrafields
2013-02-18 13:39:00 +01:00
Laurent Destailleur
f82bec552b
Fix: Check id field are mandatory
2013-02-18 13:07:32 +01:00
Laurent Destailleur
fb845b3a37
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-02-18 13:02:13 +01:00
Laurent Destailleur
37e9b04d83
Fix: Check id field are mandatory
2013-02-18 12:57:14 +01:00
Grand Philippe
d2cc6d299c
fix language
2013-02-18 12:19:01 +01:00
jfefe
fe57b513f8
Merge branch 'extra_odt' into extrafields
2013-02-18 00:58:54 +01:00
jfefe
71a2b4c8c0
In ODT document add currency symbol with extrafields of type "price"
2013-02-18 00:58:40 +01:00
jfefe
bd2d9cdd3e
Split extrafields display into 2 columns (thirdparty)
2013-02-18 00:41:50 +01:00
jfefe
3ef8c6e5dd
Missing variable declaration
2013-02-18 00:40:49 +01:00
fhenry
3694031053
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-02-17 21:41:27 +01:00
jfefe
8ebb48cb5c
Fix : in ODT show value and not label of company extrafield
2013-02-17 21:28:00 +01:00
jfefe
060060f08b
Missing object $langs when showing extrafield of type 'price'
2013-02-17 21:27:48 +01:00
jfefe
16e9f6db48
Fix : bad name of property when retrieve extrafields for thirdparty
2013-02-17 21:27:33 +01:00
jfefe
527beab671
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into extra_odt
2013-02-17 21:26:56 +01:00
Laurent Destailleur
d6e907b69b
Fix: Nb of holidays was not using correct user
2013-02-17 19:26:33 +01:00
Laurent Destailleur
2bad9c0d9a
Fix: Nb of holidays was not using correct user
2013-02-17 19:25:55 +01:00
Laurent Destailleur
8af34ee97e
Fix: Bad property
2013-02-17 18:40:09 +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
df2fde3a68
Prepare 3.3 release
2013-02-17 17:17:19 +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
9f8ffe242a
Fix: A text field can not have a default value
2013-02-17 16:26:06 +01:00
Laurent Destailleur
aa8413d7cb
Fix: Missing migration
...
Fix: Error management
2013-02-17 16:20:49 +01:00
Laurent Destailleur
aff919fd10
Fix: Bad test
2013-02-17 12:45:46 +01:00
Laurent Destailleur
249a03dd57
Merge pull request #659 from jfefe/extrafields
...
Work on extrafields
2013-02-16 14:19:24 -08:00
Laurent Destailleur
42b37c081a
Merge pull request #648 from cbattarel/fix_contact_address_autofill
...
fix contact address autofill
2013-02-16 14:19:08 -08:00
Laurent Destailleur
fdf8c9dc43
Merge pull request #657 from defrance69/patch-12
...
Update htdocs/product/class/product.class.php
2013-02-16 14:18:17 -08:00
Laurent Destailleur
4dca883f21
Merge pull request #655 from FHenry/develop
...
Task 714 and Fix bug on task 350
2013-02-16 14:16:08 -08:00
Laurent Destailleur
2ea62073b6
Merge pull request #660 from grandoc/develop
...
fix : doesn't work with a /
2013-02-16 14:14:30 -08:00
Laurent Destailleur
50decdd941
Fix: When creating user on other entity, no way to read user
...
after creation.
2013-02-16 21:06:15 +01:00
jfefe
4f5b636cc7
Fix : missing class file
2013-02-16 13:58:21 +01:00
jfefe
fa53147d0a
Retrieve extrafields when fetch thirparty
...
Work on extrafields support in thirpdparty ODT document
2013-02-16 03:41:11 +01:00
Grand Philippe
ab2b06117b
fix trad : change adresse versus address
2013-02-15 19:56:51 +01:00
Grand Philippe
785e72d533
fix trad : change adresse versus address
2013-02-15 19:36:09 +01:00
Grand Philippe
2bfd6c40d0
fix trad : change adresse versus address
2013-02-15 19:26:09 +01:00
Grand Philippe
12317d0371
fix trad : change adresse versus address
2013-02-15 19:18:26 +01:00
Laurent Destailleur
b1ee14ce60
New: Can define a hierarchical responsible on users.
2013-02-15 18:39:27 +01:00
Laurent Destailleur
145573ea79
Qual: Removed useless code for old modules. There is hook now to do same
...
job.
2013-02-15 17:37:30 +01:00
Grand Philippe
7c47dedbce
fix trad: begin change address instead of adresse
2013-02-15 17:33:07 +01:00
Laurent Destailleur
e0bbb78f56
Fix: Merge customer and prospect tab
2013-02-15 17:28:07 +01:00
Laurent Destailleur
7260f39d21
New: Support tag total_vat_x.y for vat rate x.y into ODT templates
2013-02-15 17:06:32 +01:00
Grand Philippe
7c1a4e6fdf
fix trad to get better understanding
2013-02-15 15:48:53 +01:00
Grand Philippe
cddd59d98d
fix : doesnt work with a \/
2013-02-15 14:23:35 +01:00
jfefe
3d8197ce4b
Work on extrafields : position management & new type : select list
2013-02-15 11:19:49 +01:00
Laurent Destailleur
7b9fc49dea
More CSS3
2013-02-15 10:46:50 +01:00
Laurent Destailleur
71b814156b
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-02-15 10:42:50 +01:00
Laurent Destailleur
bbb18b3175
Look: More CSS3
2013-02-15 10:42:35 +01:00
BENKE Charles
f847558363
Update htdocs/product/class/product.class.php
...
fetch_prod_arbo / recursive call of the child product test
2013-02-15 07:21:10 +01:00
jfefe
14f21bc9f1
Add select list in extrafields type
2013-02-15 00:17:42 +01:00
fhenry
c02bd08711
Checkstyle
2013-02-14 16:35:54 +01:00
fhenry
ff214dd295
Manage tabs (add/remove by external module) for mass emalings screen
2013-02-14 16:25:43 +01:00
fhenry
f65f0e3f11
Remove debug string in buf correction of task 350
2013-02-14 15:27:48 +01:00
fhenry
d41e754f43
Fix bug on task 350
2013-02-14 15:08:22 +01:00
fhenry
ebf002d79e
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-02-14 14:59:24 +01:00
fhenry
2af7fd858e
Task 714
2013-02-14 14:57:37 +01:00
fhenry
f043fcfaf7
Fix bug [ bug #709 ]
2013-02-14 13:55:05 +01:00
jfefe
3780d0fde6
New webservice method to change user password
2013-02-14 13:15:55 +01:00
jfefe
e2d03a9dba
Add possibility to disable hook on list of recent file
2013-02-14 13:15:23 +01:00
Laurent Destailleur
365680d90e
Fix: Missing vat rates
2013-02-13 21:25:17 +01:00
Laurent Destailleur
91215a075a
Merge pull request #653 from atm-maxime/develop
...
Set draft function
2013-02-13 08:54:57 -08:00
Laurent Destailleur
031bc911ea
Fix: Mass save or update of const fails.
2013-02-13 16:47:25 +01:00
Laurent Destailleur
f869004b95
Fix: Mass save or update of const fails.
2013-02-13 16:46:28 +01:00
Laurent Destailleur
7d1c51ab77
Add option MAIN_PDF_TITLE_BACKGROUND_COLOR
2013-02-13 16:45:53 +01:00
Maxime Kohlhaas
1cfd32680a
Fix : set some vars when invoice is back to draft status
2013-02-13 15:43:27 +01:00
Maxime Kohlhaas
bfc5cfebce
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
2013-02-13 15:42:41 +01:00
Laurent Destailleur
caec1429b1
Fix: Uniformize database type according to page http://
2013-02-13 15:19:03 +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
Christophe Battarel
b372a8c5ba
prepare db for margin on contracts
2013-02-13 08:59:40 +01:00
Christophe Battarel
5c9950f486
prepare db for margin on contracts
2013-02-13 08:55:16 +01:00
fhenry
136dc651f3
Merge branch 'develop' into develop_merger_cust_prospect_tab
2013-02-12 19:18:15 +01:00
fhenry
82fc8e1536
Task 350 in Doliforge
2013-02-12 19:16:48 +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
fhenry
6ad617842d
Commit temporaire
2013-02-12 15:31:12 +01:00
Laurent Destailleur
6bbac00c22
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
htdocs/holiday/class/holiday.class.php
htdocs/user/fiche.php
2013-02-12 15:17:22 +01:00
Laurent Destailleur
4c936ffffd
Merge pull request #645 from FHenry/dev_contactcombox
...
Task [ task #711 ]
2013-02-12 06:08:04 -08:00
Laurent Destailleur
ddf27b2c67
Fix Bug 708
2013-02-12 15:01:16 +01:00
Laurent Destailleur
8a72ff8fc2
Fix: bad translation
2013-02-12 14:48:51 +01:00
Laurent Destailleur
112526e8b1
Fix: bad translation
2013-02-12 14:48:12 +01:00
Christophe Battarel
af849a5ab0
fix contact address autofill
2013-02-12 10:33:10 +01:00
fhenry
d8d4b669ab
Task [ task #711 ]
2013-02-12 09:49:27 +01:00
Laurent Destailleur
82dda5723b
Fix: Disable autocomplete
2013-02-12 01:29:26 +01:00
Laurent Destailleur
935f2d9bd8
Add TODO
2013-02-11 21:23:25 +01:00
Laurent Destailleur
c7a6ee492d
New: Add push from Philippe to manager user hierarchy.
2013-02-11 20:45:36 +01:00
Laurent Destailleur
f1d105b66c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-02-11 20:27:11 +01:00
Laurent Destailleur
4ceeadaa35
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-02-11 20:26:18 +01:00
Laurent Destailleur
d2275a0bbd
New: Add param to show title
2013-02-11 20:26:01 +01:00
simnandez
77c5eaa726
Fix: Amarok login page issues
2013-02-11 09:13:33 +01:00
Laurent Destailleur
fed591d989
Merge pull request #641 from simnandez/3.3
...
Fix: Amarok login page issues
2013-02-10 17:37:38 -08:00
Laurent Destailleur
638871c40c
Merge pull request #640 from defrance69/patch-11
...
Update htdocs/product/class/product.class.php
2013-02-10 17:36:27 -08:00
Laurent Destailleur
b112b7d87e
Merge pull request #638 from grandoc/develop
...
useless file
2013-02-10 17:35:27 -08:00
Laurent Destailleur
4d9f22c909
Renamed "Salvador" into "El Salvador"
2013-02-10 22:09:25 +01:00
Laurent Destailleur
e5e9dc404b
Fix: Bad choice of template
2013-02-10 21:57:53 +01:00
Laurent Destailleur
49f40ee429
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-02-10 21:56:44 +01:00
Laurent Destailleur
28fa96b516
Fix: Bad choice of template
2013-02-10 21:56:29 +01:00
simnandez
caf6fa2240
Fix: Amarok login page issues
2013-02-10 11:09:21 +01:00
BENKE Charles
f084bbbb19
Update htdocs/product/class/product.class.php
...
bug on list of childs of product
if two products have the same label, the list display only one line
2013-02-08 21:21:25 +01:00
Maxime Kohlhaas
717a834e8a
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
2013-02-08 13:51:05 +01:00
Maxime Kohlhaas
7c458777cf
Task # 559 : product customer prices by quantity, correction
2013-02-04 10:21:59 +01:00
Grand Philippe
b492c7e754
fix some translations
2013-02-04 09:53:42 +01:00
Grand Philippe
4a4c7e9ca9
useless file
2013-02-04 08:54:04 +01:00
simnandez
ad91eab0ac
[ task #652 ] Reduce clicks into creaton of orders, invoices, etc.
...
Uniformize propal code (not use addpropal.php)
2013-02-02 18:31:45 +01:00
simnandez
a9de14c145
Trad: Add missing translations
2013-02-01 17:49:41 +01:00
Laurent Destailleur
36eb0f01d8
Merge pull request #635 from simnandez/3.3
...
Trad: Add missing translations
2013-02-01 08:36:07 -08:00
Laurent Destailleur
1e74ac24ab
Move message at bottom.
2013-02-01 17:34:19 +01:00
Laurent Destailleur
72c5652a4a
Fix: Holiday module update always done
2013-02-01 10:13:42 +01:00
Laurent Destailleur
9f7a06e04d
Fix: Test not complete
2013-02-01 09:56:45 +01:00
simnandez
7134ab5594
Trad: Add missing translations
2013-02-01 09:28:02 +01:00
Laurent Destailleur
26c66a11ed
Fix: Bug 701
2013-01-31 10:21:34 +01:00
Maxime Kohlhaas
66376f1c83
Bug # 701 : A user can only be set admin by an admin
2013-01-31 09:56:52 +01:00
Maxime Kohlhaas
da066badc8
LDAP : no user update for the moment, dev for updating user from ldap is not working yet
2013-01-30 16:53:59 +01:00
Maxime Kohlhaas
51800a0dd5
Security : add phtml extension to be dealed as php extension
2013-01-30 16:52:33 +01:00
Maxime Kohlhaas
a3027d4590
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
2013-01-30 16:50:32 +01:00
Maxime Kohlhaas
faccc978b4
LDAP : start implementing user update function after LDAP connexion
2013-01-30 16:50:28 +01:00
Laurent Destailleur
2300b9d3db
Merge remote-tracking branch 'origin/3.3' into develop
2013-01-30 15:25:02 +01:00
Laurent Destailleur
7ee530f826
New: Add field to store hierarchy of users.
2013-01-30 15:23:49 +01:00
fhenry
96efa87708
Fix bug
...
"A user can always read its own card" false today for external user even
if user get right to change his won info
2013-01-29 20:05:08 +01:00
Laurent Destailleur
30764a6c00
Fix: Option COMPANY_USE_SEARCH_TO_SELECT was not working for third party
...
selection when autocomplete is on.
2013-01-29 16:14:53 +01:00
Laurent Destailleur
ab82a293e9
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-01-29 15:25:00 +01:00
Laurent Destailleur
180fb2c91a
Fix: Option COMPANY_USE_SEARCH_TO_SELECT was not working for third party
...
selection when autocomplete is on.
2013-01-29 15:22:07 +01:00
Regis Houssin
715443e0b0
Merge pull request #631 from jfefe/webservices
...
Fix : wrong value for contact_id when call getUser webservice method
2013-01-29 01:25:33 -08:00
jfefe
ed92e91cc0
Fix : wrong value for contact_id when call getUser webservice method (contact_id is variable name in user.class)
2013-01-29 03:59:23 +01:00
Regis Houssin
a177853299
Fix: la bétise n'a pas de limite ! restons archaïque.
2013-01-28 20:30:33 +01:00
Laurent Destailleur
a268592b61
Qual: Clean not used library.
2013-01-28 18:01:50 +01:00
Laurent Destailleur
755325dcf0
Qual: Removed deprecated file
2013-01-28 17:59:35 +01:00
Laurent Destailleur
0383080d90
Fix: bad menu file name
2013-01-28 17:37:40 +01:00
Laurent Destailleur
f4c4a43f57
Merge remote-tracking branch 'origin/3.3' into develop
2013-01-28 17:31:17 +01:00
Laurent Destailleur
9eaf8af341
Fix: Removed warning (this can be normal behaviour)
...
Fix: menu manager name has changed
2013-01-28 15:35:29 +01:00
Laurent Destailleur
0743049dc4
Fix: get list of currencies
2013-01-28 14:57:37 +01:00
Laurent Destailleur
c42a0c5b03
Fix: removed warning
2013-01-28 14:40:15 +01:00
Laurent Destailleur
ac3ccade98
Fix: number of chars to low to show value.
2013-01-28 13:11:12 +01:00
Laurent Destailleur
0beea6c23c
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
htdocs/install/inc.php
2013-01-28 12:58:16 +01:00
Laurent Destailleur
a8ccc0ab0b
Fix: loghandler loaded twice.
2013-01-28 12:36:15 +01:00
Laurent Destailleur
db38c9baac
Fix: loghandler loaded twice
2013-01-28 12:35:29 +01:00
Laurent Destailleur
b98151db94
Fix: A log handler can be loaded twice.
2013-01-28 12:22:12 +01:00
Laurent Destailleur
abd8aea06b
Fix: Log not reported
...
Fix: charset not correctly forced
Conflicts:
htdocs/install/inc.php
2013-01-28 11:56:45 +01:00
Laurent Destailleur
eeba48f9b0
Fix: Log not reported
...
Fix: charset not correctly forced
2013-01-28 11:43:49 +01:00
Laurent Destailleur
1b8634588f
Fix: Missing property
2013-01-28 11:31:44 +01:00
Laurent Destailleur
dde8738999
Qual: Add a protection to detect bad usage of getStaticMember
2013-01-28 11:30:28 +01:00
Laurent Destailleur
2002388098
Revert "New: add hook getFormMail"
...
This reverts commit c732532483
2013-01-26 13:40:31 +01:00
Regis Houssin
647cbb08fb
Fix: wrong EOL
2013-01-26 10:38:11 +01:00
Regis Houssin
fcee35c65d
Fix: $hookmanager is a global object
2013-01-26 10:35:30 +01:00
Laurent Destailleur
64cac3194c
Fix: Use translation of NPR
2013-01-25 19:19:41 +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
1cc949777f
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-01-25 17:46:42 +01:00
Laurent Destailleur
c2d334624b
Qual: Simplify system for menu manager. Only one file, one class per
...
manager.
2013-01-25 17:44:23 +01:00
Regis Houssin
e3be718a57
Fix: wrong object name
2013-01-25 12:38:41 +01:00
Regis Houssin
7983b1dec5
Fix: wrong object name
2013-01-25 12:37:03 +01:00
simnandez
ad3645f7f4
Fix: [ bug #698 ] Bad calculation of totals of associated documents
2013-01-25 11:37:30 +01:00
Laurent Destailleur
70b21172f9
Qual: Removed not used and deprecated property
2013-01-25 11:05:44 +01:00
Maxime Kohlhaas
7facbf7aa2
Multicompany restriction for transverse mode not used anymore. RestrictedArea is enough
2013-01-24 18:12:29 +01:00
Maxime Kohlhaas
8ab450f69b
Multicompany restriction for transverse mode not used anymore. RestrictedArea is enough
2013-01-24 17:54:51 +01:00
Regis Houssin
6089ba614e
Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop
2013-01-24 17:32:52 +01:00
Regis Houssin
b50a9415df
Merge branch '3.3' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.3
2013-01-24 17:31:51 +01:00
Regis Houssin
c688e2afab
New: add hook getFormMail
2013-01-24 17:31:22 +01:00
Regis Houssin
c732532483
New: add hook getFormMail
2013-01-24 17:29:11 +01:00
simnandez
03d6903248
Fix: [ bug #698 ] Bad calculation of totals of associated documents
2013-01-24 12:53:42 +01:00
Laurent Destailleur
9f44161e55
New: Can attach file for trip and expenses module
2013-01-24 12:47:06 +01:00
Laurent Destailleur
8682d3c928
Fix: Note not visible
2013-01-24 12:16:00 +01:00
Laurent Destailleur
fa2e9cbd4f
Exclude external modules
2013-01-24 10:06:39 +01:00
Laurent Destailleur
0db303ca59
Merge remote-tracking branch 'origin/3.3' into develop
2013-01-23 23:35:39 +01:00
Laurent Destailleur
3472282703
Fix: [ bug #667 ] Customer categories wrong tree shown after update
...
3.2->3.3
2013-01-23 23:34:43 +01:00
Regis Houssin
efadc2c75c
Fix: remove unused support
2013-01-23 21:04:41 +01:00
fhenry
848bb5417d
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-01-23 19:46:44 +01:00
fhenry
7fcf206603
Add SparkAngel Support for Open-concept.pro
2013-01-23 19:46:28 +01:00
Laurent Destailleur
a7d41d74e8
Merge remote-tracking branch 'origin/3.3' into develop
2013-01-23 18:09:05 +01:00
Laurent Destailleur
5e42a9ff8a
Fix: Revert again another fix that was not correct. It was no more
...
possible to edit a user even if user has permission for.
If module multicompany does not exists (standard mode), no
other test must be added to the if, except the $canxxx test.
2013-01-23 18:08:11 +01:00
Laurent Destailleur
73380b181c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-01-23 17:35:57 +01:00
jfefe
9b28f98119
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into webservices
2013-01-23 16:39:49 +01:00
jfefe
c7df80a6b5
Add extrafields for webservice contact / missing fields
2013-01-23 16:34:21 +01:00
Regis Houssin
beea9c2ec4
Fix: use the users entity
2013-01-23 15:44:51 +01:00
Regis Houssin
9203cce485
Fix: use the users entity
2013-01-23 15:41:17 +01:00
Regis Houssin
4a0bc90d5a
Fix: only once superadmin and an admin can not delete/modify a
...
superadmin
2013-01-23 15:27:36 +01:00
Regis Houssin
459adb146c
Fix: only once superadmin and an admin can not delete/modify a
...
superadmin
2013-01-23 15:26:18 +01:00
Regis Houssin
b12101a650
Fix: only once superadmin if no multicompany setup
2013-01-23 15:11:33 +01:00
Laurent Destailleur
f159660970
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-01-23 14:55:57 +01:00
Laurent Destailleur
7b1e15f340
New: Allow to use upgrade script to upgrade sql of modules
2013-01-23 14:51:15 +01:00
Regis Houssin
9868880142
Fix: missing files library
2013-01-23 11:29:58 +01:00
Regis Houssin
173740157f
Merge branch '3.3' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.3
2013-01-23 11:28:49 +01:00
Regis Houssin
c66c02e745
Fix: missing files library
2013-01-23 11:28:11 +01:00
Laurent Destailleur
5f2af00397
Add logs to debug
2013-01-23 00:24:20 +01:00
Regis Houssin
e8ce9cecf2
Fix: broken features, special_code also used by externals modules !
2013-01-22 21:36:30 +01:00
Regis Houssin
06a0da990b
Fix: broken features, special_code also used by externals modules !
2013-01-22 21:35:15 +01:00
Laurent Destailleur
d2152a8342
Restore correct code: A module decide if standard code is used or not
...
after running by a return code that is an int
0=execute standard code, 1=disable standard code
To return a string to show or an array or error codes, this must be done
by setting
$actionclassinstance->results
or
$actionclassinstance->resprints
2013-01-22 18:15:51 +01:00
Regis Houssin
7b04da43c1
Merge branch '3.3' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.3
2013-01-22 18:07:22 +01:00
Regis Houssin
bfe57b21b0
Fix: disable "datetimepicker" from edit in place for the moment
2013-01-22 18:05:41 +01:00
Regis Houssin
a019b1c854
Fix: disable "datetimepicker" from edit in place for the moment
2013-01-22 18:04:04 +01:00
Laurent Destailleur
b0c1137397
Restore correct code: A module decide if standard code is used or not
...
after running by a return code that is an int
0=execute standard code, 1=disable standard code
To return a string to show or an array or error codes, this must be done
by setting
$actionclassinstance->results
or
$actionclassinstance->resprints
2013-01-22 17:43:41 +01:00
Laurent Destailleur
d622078d08
Merge branch '3.3' of https://github.com/Dolibarr/dolibarr.git into 3.3
2013-01-22 17:14:44 +01:00
Regis Houssin
910543c5b9
Fix: broken feature
2013-01-22 16:53:39 +01:00
Regis Houssin
f0361b9c4c
Fix: broken feature
2013-01-22 16:51:10 +01:00
Laurent Destailleur
ec76127625
Fix: http://www.dolibarr.fr/forum/12-howto--aide/28089-adherents--tiers
...
Fix: Update member
2013-01-22 15:14:46 +01:00
Regis Houssin
131dd663cb
Fix: missing webservices and code more simple
2013-01-22 11:28:53 +01:00
Laurent Destailleur
d5a3649d72
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-01-21 23:42:03 +01:00
Regis Houssin
92849ae039
Fix: $modules not loaded
2013-01-21 18:20:14 +01:00
jfefe
a03099bd58
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into webservices
2013-01-21 15:13:43 +01:00
jfefe
2276addef7
Fix : bad value for order line's price when creating an order by webservice / remove duplicate code
2013-01-21 15:13:08 +01:00
Laurent Destailleur
2f7292aa78
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-01-21 15:04:58 +01:00
Laurent Destailleur
3faa2b558f
Renamed param.
2013-01-21 15:04:34 +01:00
Regis Houssin
71dd160c41
Fix: uniformize name
2013-01-21 14:35:49 +01:00
Regis Houssin
5b34f6ba4e
Merge pull request #622 from jfefe/webservices
...
Missing societe_id for user when called by webservice
2013-01-21 05:33:14 -08:00
fhenry
7cc548db31
Force get list of extrafield even if external module manage extrafield
2013-01-21 13:52:59 +01:00
fhenry
91e86c5a59
Merge branch '3.3' of https://github.com/Dolibarr/dolibarr.git into 3.3
2013-01-21 13:48:29 +01:00
fhenry
bc8c36b08f
Add parameters force get Extarfield list from ll_extrafield even if
...
external extrafield module is enabled
2013-01-21 13:48:15 +01:00
jfefe
a201d8cea0
Fix : bad classname in webservice to create an order
2013-01-21 11:43:22 +01:00
jfefe
8d8e649646
Rename societe_id -> id_thirdparty in webservice method to get an user
2013-01-21 11:42:25 +01:00
Laurent Destailleur
05bd489b82
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
htdocs/admin/index.php
2013-01-21 01:12:19 +01:00
Laurent Destailleur
e236ac3f03
Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3
2013-01-21 01:07:22 +01:00
Laurent Destailleur
9cf405f9d2
Fix: syntax error
2013-01-21 01:06:52 +01:00
eldy
b3dbbe94e9
Missing div warning
...
Conflicts:
htdocs/admin/index.php
2013-01-20 16:21:52 +01:00
eldy
4e8aaa99b5
Removed dead code
2013-01-20 15:41:39 +01:00
eldy
5fe1f38666
Missing div warning
2013-01-20 15:37:33 +01:00
eldy
5c49947750
Merge remote-tracking branch 'origin/3.3' into develop
2013-01-20 15:32:48 +01:00
jfefe
b76fd1804b
Missing societe_id for user when called by webservice
2013-01-20 15:31:24 +01:00
eldy
d1dc04761a
Fix: dev rule to build portable requests
2013-01-20 15:30:51 +01:00
eldy
6ded74d5dd
Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3
2013-01-20 15:22:14 +01:00
eldy
fc011610bb
Fix: pgsql
2013-01-20 15:21:18 +01:00
jfefe
7a60bd0b3c
Fix : missing class / bad user when create thirdparty with contact and
...
user by webservice method
2013-01-20 12:39:26 +01:00
jfefe
1ab6fe6c21
Fix : missing class / bad user when create thirdparty with contact and
...
user by webservice method
2013-01-20 11:56:56 +01:00
Laurent Destailleur
5597e1b5c2
Protection to avoid not desired modules into packages
2013-01-19 18:47:35 +01:00
Laurent Destailleur
d411310651
Trad
2013-01-19 17:58:20 +01:00
Laurent Destailleur
2f3ed04023
Add info if session are encrypted
2013-01-19 17:56:26 +01:00
Laurent Destailleur
47c42943e8
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-01-19 16:29:35 +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
7002b328a8
Fix: [ bug #685 ] Supplier invoices should use encoding sequence number
...
as secondary sorting field
2013-01-19 15:32:03 +01:00
Laurent Destailleur
f701559056
Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3
2013-01-19 14:32:50 +01:00
Laurent Destailleur
0e13b3872d
Fix: Removed warnings
2013-01-19 14:32:37 +01:00
simnandez
f7e5edb0f8
[ task #652 ] Reduce clicks into creaton of orders, invoices, etc.
2013-01-19 10:45:57 +01:00
Laurent Destailleur
0e060cac11
Merge pull request #619 from FHenry/develop
...
Update web service
2013-01-18 09:39:13 -08:00
Laurent Destailleur
aaa56ce606
Merge pull request #618 from simnandez/3.3
...
Fix: Bad Spanish departament name
2013-01-18 09:30:45 -08: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
591eab4826
Detect another problem into box. Just add a comment.
2013-01-18 14:22:18 +01:00
Laurent Destailleur
a12972034f
Fix: Start to fix some bugs
2013-01-18 13:56:36 +01:00
Laurent Destailleur
3438b9fa62
Fix: init specimen
2013-01-18 12:32:10 +01:00
Laurent Destailleur
f650888ea6
Merge remote-tracking branch 'origin/3.3' into develop
2013-01-18 12:17:21 +01:00
Laurent Destailleur
7c826dc38d
Fix: Bad error management
2013-01-18 12:09:39 +01:00
Laurent Destailleur
57a869683d
Fix date function
2013-01-18 11:28:06 +01:00
fhenry
e4b704f76d
Update web service
2013-01-18 11:10:56 +01:00
Laurent Destailleur
abafd4f4ff
Fix: separator was working only once.
2013-01-18 11:05:18 +01:00
simnandez
a57f291aa2
Fix: Bad Spanish departament name
2013-01-18 09:28:54 +01:00
Laurent Destailleur
91f666bd90
Merge pull request #617 from FHenry/develop
...
Fix bug on update thirdpartty webservice
2013-01-17 11:28:35 -08:00
fhenry
685400c20e
Fix bug on web service
2013-01-17 18:49:21 +01:00
Laurent Destailleur
6091f74b13
New: First changes to simplify/optimize menu management.
2013-01-17 18:39:15 +01:00
fhenry
9d5ab6daa0
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-01-17 18:04:47 +01:00
fhenry
f665980ef0
Fix bug on update thirdpartty webservice
2013-01-17 18:03:10 +01:00
Laurent Destailleur
db54f5af44
Merge remote-tracking branch 'origin/3.3' into develop
2013-01-17 18:02:51 +01:00
Laurent Destailleur
c16269d04e
Fix: load at wrong place
...
Conflicts:
htdocs/core/class/html.formother.class.php
2013-01-17 17:59:47 +01:00
Laurent Destailleur
9d5b36b27b
Fix: error set on non object
2013-01-17 17:54:08 +01:00
Laurent Destailleur
b89b74e933
Fix: load at wrong place
2013-01-17 17:40:27 +01:00
Laurent Destailleur
f0f347394a
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-01-17 13:15:30 +01:00
Laurent Destailleur
cccc7d1af3
Fix: comments
2013-01-17 13:02:34 +01:00
Laurent Destailleur
2b8aa54f68
Merge remote-tracking branch 'origin/3.3' into develop
2013-01-17 10:32:49 +01:00
Laurent Destailleur
3685911bfa
Merge pull request #616 from FHenry/3.3
...
Fix bug [ bug #694 ] Set security permision to user belong to group
2013-01-16 11:45:33 -08:00
fhenry
968e980f58
Fix bug [ bug #694 ] Set security permision to user belong to group
2013-01-16 18:58:39 +01:00
simnandez
e820e62c03
Trad: Best ca_ES and es_ES translations
2013-01-16 18:19:48 +01:00
Laurent Destailleur
533f162e3e
Fix: var not defined
2013-01-16 17:09:46 +01:00
Laurent Destailleur
0923102c4a
Fix: Duplicate declaration
2013-01-16 16:53:47 +01:00
Laurent Destailleur
f1f7ff315f
Fix: CRLF
2013-01-16 15:54:07 +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
d40440fc45
Merge remote-tracking branch 'origin/3.3' into develop
2013-01-16 14:21:56 +01:00
Laurent Destailleur
6d843e76e1
Merge pull request #614 from FHenry/develop
...
Add adherent type extrafield extrafield table in migration script
2013-01-16 05:20:07 -08:00
Laurent Destailleur
0b045a2d96
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
htdocs/core/boxes/box_activity.php
htdocs/filefunc.inc.php
2013-01-16 14:11:19 +01:00
fhenry
e3fd60c762
Add adherent type extrafield extrafield table in migration script
2013-01-16 13:49:44 +01:00
Laurent Destailleur
5497b93247
Fix: Removed warning
2013-01-16 13:43:25 +01:00
Laurent Destailleur
a92b1d8677
Merge pull request #613 from FHenry/3.3
...
Fix bug 692, 681
2013-01-15 14:14:49 -08:00
fhenry
ff06b05b3d
Fix Bug [ bug #681 ] Can't modify a line a business proposal
2013-01-15 23:04:42 +01:00
fhenry
b8dfee2a3b
Fix bug [ bug #692 ] Can't search for suppliers invoice
2013-01-15 23:03:03 +01:00
fhenry
d3ca82d984
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-01-15 21:43:24 +01:00
fhenry
1605e72adb
Add update actioncomm webservice method
...
Fix bug on update thridparty webservice method
2013-01-15 21:43:11 +01:00
Regis Houssin
6d882c18de
Merge pull request #610 from FHenry/3.3
...
Remove bad retrun parameters
2013-01-15 10:23:12 -08:00
Laurent Destailleur
3b8e99dd4e
Fix: Bad menu def
2013-01-15 18:49:53 +01:00
fhenry
b6b9f06a72
Remove bad retrun parameters
2013-01-15 18:32:14 +01:00
Laurent Destailleur
1e9cb6b1d4
Qual: A translation file must not be loaded into class constructors, but
...
at output level.
2013-01-15 17:06:53 +01:00
Laurent Destailleur
7075ae2daa
Fix: Showing warning
2013-01-15 16:08:16 +01:00
Laurent Destailleur
6a51db82e9
Qual: We can enable box by default because a warning is output to user.
2013-01-15 15:53:35 +01:00
Laurent Destailleur
db923b9814
Fix: Removed warning
2013-01-15 15:44:42 +01:00
Laurent Destailleur
e28fefc989
Fix: Missinf class
2013-01-15 15:43:37 +01:00
Laurent Destailleur
db1cd6b27f
Qual: Merge the 2 class MenuTop and MenuLeft into menu handler file
...
into 1 class MenuManager. This make code simpler and is also a first
step to optimize performance of menu loading.
2013-01-15 15:42:39 +01:00
Laurent Destailleur
ec5b4f5fa7
Fix: Start to fix some bug (pgsql compatibility), try to optimize
...
request. Added FIXME tags.
2013-01-15 15:36:04 +01:00
Laurent Destailleur
1851aa4646
Fix: Move not stable feature as experimental. Disabled box by default
...
because there is still some bug (pgsl support, filters) and major
problem to solve (it slow down seriously Dolibarr, result not accurate
for some status).
2013-01-15 15:26:46 +01:00
Laurent Destailleur
0c6c2eca8a
Fix: Removed warning
2013-01-15 13:11:36 +01:00
Laurent Destailleur
4cf56eafa5
Qual: Removed useless param
2013-01-15 12:48:46 +01:00
Laurent Destailleur
f57409ddcd
Merge remote-tracking branch 'origin/3.3' into develop
2013-01-15 12:06:41 +01:00
Laurent Destailleur
086b223c81
Merge branch '3.3' of https://github.com/Dolibarr/dolibarr.git into 3.3
2013-01-15 11:50:15 +01:00
Regis Houssin
92723bd6fe
Fix: broken features
2013-01-15 11:41:12 +01:00
Laurent Destailleur
11bb3d0137
Fix: Several fixes into boxes management: boxes was loaded twice, logs
...
were wrong, global conf missing.
2013-01-15 11:35:10 +01:00
Regis Houssin
8a6bc63127
Fix: uniformize code
2013-01-15 11:23:24 +01:00
fhenry
52b4d98849
remove parenthesis not usefull
2013-01-15 11:11:24 +01:00
Regis Houssin
787d3bd6a9
Fix: use event method
2013-01-15 11:00:32 +01:00
fhenry
f214c06b1e
Add option to fecth extrafield even if extranal extrafield module is
...
enabled. Usefull for web service to fetch optionnal from llx_extrafields
even if record or update is manage by hook with external module
2013-01-15 10:20:19 +01:00
Laurent Destailleur
285bcbecb7
Fix: init of new syslog handler system
2013-01-14 17:12:13 +01:00
Laurent Destailleur
3332709ba1
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-01-14 16:51:38 +01:00
fhenry
51098c1227
Add standard extrafield type :
...
- mail
- phone
- price
2013-01-14 16:13:09 +01:00
Laurent Destailleur
6942700ce7
New: Direct jump to edit page
2013-01-14 15:18:15 +01:00
Laurent Destailleur
e8ab24949a
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-01-14 13:08:48 +01:00
Laurent Destailleur
49313fff3b
Fix: External user should not see boxes of modules not allowed to
...
external users.
2013-01-14 13:06:08 +01:00
Laurent Destailleur
b9dc76ebaf
Fix: List of contacts when connected as external user.
2013-01-14 12:27:19 +01:00
Laurent Destailleur
6746e76564
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-01-14 12:24:06 +01:00
Maxime Kohlhaas
14dde75c4b
Display bug on FF while closing proposal
2013-01-14 12:17:21 +01:00
Maxime Kohlhaas
6abf682faa
Multi-company compatibility with transverse mode for pdf models
2013-01-14 12:01:44 +01:00
Laurent Destailleur
07ba988cf8
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-01-14 11:45:16 +01:00
Laurent Destailleur
297c10d16b
Qual: externalise code of merging PDFs into a library.
2013-01-14 11:39:30 +01:00
Maxime Kohlhaas
fb1d99d0dd
Multi-company compatibility with transverse mode for home boxes
2013-01-14 11:09:10 +01:00
Laurent Destailleur
0861fbfeb6
Fix: Missing kenya currency
2013-01-13 23:47:23 +01:00
Laurent Destailleur
8b77005eae
Merge pull request #605 from FHenry/develop
...
remove dummy line
2013-01-13 11:59:14 -08:00
fhenry
b9c53fd796
remove dummy line
2013-01-13 20:50:54 +01:00
Laurent Destailleur
29e6d01e51
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
htdocs/core/tpl/freeproductline_create.tpl.php
htdocs/core/tpl/predefinedproductline_create.tpl.php
2013-01-13 19:33:54 +01:00
Laurent Destailleur
0f6506d457
Fix: not object error with option SERVICE_ARE_ECOMMERCE_200238EC
2013-01-13 18:57:55 +01:00
simnandez
ffbb611eb4
[ task #652 ] Reduce clicks into creaton of orders, invoices, etc.
2013-01-13 10:57:39 +01:00
simnandez
b1369a2f01
[ task #652 ] Reduce clicks into creaton of orders, invoices, etc.
2013-01-12 22:08:52 +01:00
Laurent Destailleur
980bfde83e
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-01-12 19:59:09 +01:00
Laurent Destailleur
c9a6da610d
To allow module to use ckeditor/config.js
2013-01-12 16:00:38 +01:00
Laurent Destailleur
1bed4aa193
Merge pull request #602 from FHenry/develop
...
Add boolean (checkbox) standard extrafield feature
2013-01-12 06:53:48 -08:00
Laurent Destailleur
8152dda733
Merge pull request #601 from simnandez/develop
...
[ task #652 ] Reduce clicks into creaton of orders, invoices, etc.
2013-01-12 06:45:34 -08:00
Laurent Destailleur
979ea42d3f
Comments
2013-01-12 15:40:38 +01:00
fhenry
2cdeb95b67
Set member id on create not by sql request after.
...
Mandatory for trigger USER_CREATE to do action if user is member
2013-01-12 15:16:38 +01:00
Laurent Destailleur
ec8b260bf6
New: Prepare 3.4 branch
...
New: Add hook for agenda, info and category tabs
2013-01-12 14:34:16 +01:00
fhenry
d39368fd36
Add boolean (checkbox) standard extrafield feature
2013-01-12 14:02:39 +01:00
simnandez
96c5eacf4a
[ task #652 ] Reduce clicks into creaton of orders, invoices, etc.
2013-01-12 09:58:21 +01:00
Laurent Destailleur
351c4927f4
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-01-11 16:18:47 +01:00
Laurent Destailleur
8d5dd719aa
Add svg file
2013-01-11 16:11:35 +01:00
Christophe Battarel
62ccb57857
fix missing td
2013-01-11 15:41:47 +01:00
Christophe Battarel
49703240f7
show costprice instead of buyingprice if setup of margin module is costprice
2013-01-11 15:39:11 +01:00
Christophe Battarel
38e9290729
show costprice instead of buyingprice if setup of margin module is costprice
2013-01-11 15:33:34 +01:00
fhenry
10ed8c141e
Update method in thirdparty web service
2013-01-10 23:30:26 +01:00
Laurent Destailleur
37b6bab893
Fix: Missing lang loading
2013-01-10 22:45:55 +01:00
Laurent Destailleur
14dede1a74
Fix: Protection to avoid renaming a user with a login that already
...
exists.
2013-01-10 21:32:10 +01:00
Laurent Destailleur
03b906808e
Merge pull request #593 from marcosgdf/eu-vat
...
Updated EU VAT area links and added Isle of Man
2013-01-10 12:12:25 -08:00
Laurent Destailleur
9251d9a6ac
Merge pull request #592 from marcosgdf/minor
...
Minor changes related to commit 8ac33e9
2013-01-10 12:10:49 -08:00
Laurent Destailleur
275cecccbc
Merge pull request #587 from marcosgdf/translations
...
Fixed problems with translations
2013-01-10 12:09:45 -08:00
Laurent Destailleur
3c6e4bc267
Merge pull request #590 from marcosgdf/3.3
...
Fix bug in Adherent class not saving civilite=0
2013-01-10 12:09:23 -08:00
Laurent Destailleur
941afd7545
Fix: Because of autocomplete, password was changed when we changed
...
login.
2013-01-10 20:12:14 +01:00
Laurent Destailleur
0c7b469192
Fix: Session was lost when user change its own login.
2013-01-10 20:07:44 +01:00
Laurent Destailleur
63cd0e8984
First try to include svg into css.
2013-01-10 18:50:07 +01:00
Laurent Destailleur
de03f57620
Fix: Translation
2013-01-10 18:02:06 +01:00
Laurent Destailleur
eb078e6c8a
Fix: Missing css entries. Solve look of ecm module.
2013-01-10 16:06:13 +01:00
Laurent Destailleur
a1282f5236
Fix: Navigation into projects
2013-01-10 16:04:23 +01:00
Marcos García
8e7a66a544
Fixed indentation problem
2013-01-10 14:20:03 +01:00
Marcos García
809367d23b
Updated EU VAT area links and added Isle of Man
...
Isle of Man is in included in UK state as shown in http://ec.europa.eu/taxation_customs/common/faq/faq_1179_en.htm#9
2013-01-10 14:17:43 +01:00
Marcos García
593db37423
Function getTotalDiscount of commonobject.class.php should always return a float for precission
2013-01-10 13:53:46 +01:00
Laurent Destailleur
8ac33e98e7
Fix: property object_total_discount was not working when quantity was
...
not 1.
2013-01-10 12:58:46 +01:00
Marcos García
e6e183aad4
Fix bug in Adherent class not saving civilite=0
2013-01-10 12:03:08 +01:00
Laurent Destailleur
9d886eca53
Fix: Scan of correct dir when them dir is forced
2013-01-10 11:19:46 +01:00
Grand Philippe
eea5dd36ac
fix: favicon was not displayed when using theme within custom directory
2013-01-10 09:23:52 +01:00
Regis Houssin
9812c91aff
Fix: wrong EOL !!!!!!!
2013-01-10 08:27:12 +01:00
Regis Houssin
9a305c9066
New: add date format with second
2013-01-10 06:13:02 +01:00
Marcos García
be40114541
Fixed translation problems with Prelevement module
2013-01-09 21:33:55 +01:00
Marcos García
a1e17978d1
Little es_ES typo (again)
2013-01-09 21:24:40 +01:00
Marcos García
7b1aed65cf
Little es_ES typo
2013-01-09 21:23:50 +01:00
Marcos García
3f42c198db
Little typo in es_ES translation
2013-01-09 20:53:28 +01:00
fhenry
e369d5dfd8
Fix [ bug #668 ] Event created with a profile is not visible by the same
...
profile
2013-01-09 20:34:36 +01:00
Laurent Destailleur
abccfdd168
Fix: Option SERVICE_ARE_ECOMMERCE_200238EC
2013-01-09 19:56:43 +01:00
Laurent Destailleur
5c51905f63
Merge remote-tracking branch 'origin/3.3' into develop
2013-01-09 19:15:51 +01:00
Laurent Destailleur
24b50b8ed3
Fix: Example an label of category import
2013-01-09 13:29:12 +01:00
Laurent Destailleur
4a2a8e438d
Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3
2013-01-09 11:45:04 +01:00
Laurent Destailleur
7114ae33fe
Fix: Doc not uptodate
2013-01-09 11:44:45 +01:00
Laurent Destailleur
e31aedbc50
Merge pull request #584 from jfefe/3.3
...
Fix bug #666 : error when sending intervention card
2013-01-09 02:23:00 -08:00
Regis Houssin
a7ed40b10d
Fix: empty value if combobox disabled
2013-01-09 10:43:21 +01:00
Regis Houssin
a278ae7371
Fix: empty value if combobox disabled
2013-01-09 10:40:36 +01:00
jfefe
1a3cecfae5
Fix bug #666 : error when sending intervention card
2013-01-09 06:30:27 +01:00
Laurent Destailleur
64d2a662de
Merge pull request #582 from marcosgdf/translations
...
Improvements in translations
2013-01-08 14:03:52 -08:00
Laurent Destailleur
f3df7a2fec
Fix: An easier to understand fix. Remove also not recommanded "continue
...
2" instructions.
2013-01-08 22:59:36 +01:00
Laurent Destailleur
1555bb681c
Merge pull request #581 from simnandez/3.3
...
Fix: [ bug #662 ] Bad aplication of Localtax2 for suppliers if country is Spain
2013-01-08 13:38:38 -08:00
Regis Houssin
dd08da6ea8
Merge pull request #583 from FHenry/develop
...
[ task #664 ] Add extrafields behaviours to Member Type
2013-01-08 10:58:46 -08:00
fhenry
23b2aa6a7b
[ task #664 ] Add extrafields behaviours to Member Type
2013-01-08 19:16:39 +01:00
Laurent Destailleur
b7a5e226c9
Fix: Disable menu entry of a not avilable feature
2013-01-08 18:53:45 +01:00
Laurent Destailleur
53df0766cb
Fix: Translation
2013-01-08 18:47:40 +01:00
Laurent Destailleur
db0aa49cad
Merge remote-tracking branch 'origin/3.3' into develop
2013-01-08 18:37:59 +01:00
Laurent Destailleur
334b5b5dac
Fix: Minor fix
2013-01-08 18:31:55 +01:00
Laurent Destailleur
9b6289503c
Fix: Overwriting of login template works with module_parts.
2013-01-08 18:30:49 +01:00
Laurent Destailleur
5aeec9eab2
Fix: line into theme
2013-01-08 16:46:06 +01:00
Laurent Destailleur
9d47b812b9
New: Support module_parts['theme']
2013-01-08 15:21:56 +01:00
Laurent Destailleur
ec3421d59e
New: Add option MAIN_FORCETHEME (differs from MAIN_FORCETHEMEDIR)
2013-01-08 13:45:52 +01:00
Laurent Destailleur
1f320dc1e7
Fix: Comment must be before tag
2013-01-08 12:27:17 +01:00
Laurent Destailleur
9b3874f6f9
Fix: PHPUnit found regression
2013-01-08 12:26:02 +01:00
Marcos García
ae98ebc793
There is no need to warn the user as the picto already does
2013-01-08 12:14:11 +01:00
Laurent Destailleur
142f171e50
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
htdocs/.gitignore
2013-01-08 11:10:47 +01:00
Laurent Destailleur
77f177d846
Fix: Bad selection of option
2013-01-08 11:04:29 +01:00
Laurent Destailleur
a555b47acd
Merge branch '3.3' of https://github.com/Dolibarr/dolibarr.git into 3.3
2013-01-08 10:45:59 +01:00
Laurent Destailleur
47482202ac
Fix: Missing picto
2013-01-08 10:28:22 +01:00
simnandez
596df78d39
Fix: [ bug #662 ] Bad aplication of Localtax2 for suppliers if country
...
is Spain
2013-01-08 08:46:48 +01:00
Laurent Destailleur
f96c1d83cb
Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3
2013-01-07 23:22:20 +01:00
Laurent Destailleur
0889bdc3eb
Fix: Error using static method
2013-01-07 23:20:00 +01:00
Laurent Destailleur
eca1e3a7e1
Look: Minor fix in themes
2013-01-07 17:57:39 +01:00
Laurent Destailleur
6d036699bb
Qual: Uniformize usage of array module_parts.
2013-01-07 13:28:14 +01:00
Laurent Destailleur
de83dc68e1
New: Uniformize odt generation to use hooks like pdf generation
2013-01-07 02:24:20 +01:00
Laurent Destailleur
ec664aaa71
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2013-01-07 00:42:02 +01:00
Laurent Destailleur
e5f5e38736
Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3
2013-01-07 00:41:32 +01:00
Laurent Destailleur
091e469050
Fix: [ bug #622 ] attaching wrong file when sending the invoice via
...
e-mail
2013-01-07 00:40:18 +01:00
Laurent Destailleur
0f5a80a40f
Fix: Bad var name
2013-01-07 00:14:38 +01:00
eldy
24d3fdfe6c
Fix: bad setup entry page
2013-01-06 21:52:59 +01:00
eldy
2c59c6311f
Merge remote-tracking branch 'origin/3.3' into develop
2013-01-06 21:36:39 +01:00
eldy
c0bbd5d730
Merge branch '3.3' of git://github.com/Dolibarr/dolibarr.git into 3.3
2013-01-06 20:46:58 +01:00
eldy
492d00ee86
Fix: Syntax error with pgsql
2013-01-06 20:45:03 +01:00
Laurent Destailleur
567cd00f5c
Fix: Lost button
...
Conflicts:
htdocs/compta/facture.php
htdocs/fourn/facture/fiche.php
2013-01-06 13:33:09 +01:00
Laurent Destailleur
a40047d464
Merge pull request #578 from marcosgdf/translations
...
Translations!
2013-01-06 04:03:14 -08:00
Laurent Destailleur
d70f671ba0
Merge pull request #576 from simnandez/3.3
...
Fix: [ bug #662 ] Bad aplication of Localtax2 for suppliers if country is Spain
2013-01-06 04:02:12 -08:00
Marcos García
ad5d2c3459
Added missing translations, improved es_ES translations and translated untranslated text in modules admin page
2013-01-05 19:23:16 +01:00
Cedric GROSS
6a9c3dee52
Add SASU form
2013-01-05 17:07:25 +01:00
Laurent Destailleur
5f99488c99
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
htdocs/langs/es_ES/admin.lang
2013-01-05 16:41:08 +01:00
Laurent Destailleur
d44b086527
Fix: font size
2013-01-05 16:32:58 +01:00
simnandez
c0246c07b1
Fix: [ bug #662 ] Bad aplication of Localtax2 for suppliers if country
...
is Spain
2013-01-05 16:03:00 +01:00
Laurent Destailleur
a9ff3c2be1
Merge pull request #574 from simnandez/3.3
...
Fix: Modify Spanish localtax2 to new rate
2013-01-05 03:29:54 -08:00
Laurent Destailleur
9ce7a430b8
Merge pull request #573 from marcosgdf/translations
...
Added missing translations
2013-01-05 03:18:33 -08:00
simnandez
c639d80372
Fix: [ bug #662 ] Bad aplication of Localtax2 for suppliers if country
...
is Spain
2013-01-05 09:47:54 +01:00
simnandez
32b19802b1
Fix: [ bug #662 ] Bad aplication of Localtax2 for suppliers if country
...
is Spain
2013-01-05 09:43:40 +01:00
simnandez
773882c8c0
Merge branch '3.3' of git://github.com/Dolibarr/dolibarr.git into 3.3
2013-01-05 09:42:20 +01:00
simnandez
d0265db3d2
Fix: Modify Spanish localtax2 to new rate
2013-01-05 09:07:01 +01:00
Marcos García
5bf93ca41a
Added missing es_ES translation & fixed typo
2013-01-04 23:56:22 +01:00
Marcos García
d27519338a
Added missing translations
...
Reverted removal of strings in PR #570
Added missing strings to en_US
2013-01-04 22:34:55 +01:00
simnandez
5032c48322
Fix: Bug creating invoice from a contract
2013-01-04 20:54:49 +01:00
simnandez
a585d8b455
Trad: Add missing ca_ES and es_ES translations
2013-01-04 20:54:31 +01:00
simnandez
b4204b9c25
Fix: Withdrawal payment warning
2013-01-04 20:54:15 +01:00
Cedric GROSS
ff3231045b
Fix: A better fix for escaping data: escape for database must be done
...
during sql request forging. Also renamed tag to tag.
Merge:
Security fix emailing read and
unsubscribe
unsubscribe can lead to email disclosure
Conflicts:
htdocs/public/emailing/mailing-unsubscribe.php
2013-01-04 18:08:34 +01:00
simnandez
9a3681e6b0
Fix: Bug creating invoice from a contract
2013-01-04 16:23:15 +01:00
simnandez
b9ec558501
Trad: Add missing ca_ES and es_ES translations
2013-01-04 16:13:03 +01:00
simnandez
68866eaa5f
Fix: Withdrawal payment warning
2013-01-04 11:07:31 +01:00
Laurent Destailleur
a9ce8083cb
Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3
2013-01-04 00:24:39 +01:00
Laurent Destailleur
86645d8be9
Fix: Field birthday must be hidden for moral members
2013-01-04 00:23:46 +01:00
fhenry
0158885415
CheckStyle
...
I check everypalce where this function is call in Dolibarr, and to be
consistant it's better to use new attribute names
2013-01-03 23:57:18 +01:00
Laurent Destailleur
932c36e695
Merge pull request #568 from FHenry/3.3
...
CheckStyle
2013-01-03 11:47:57 -08:00
Laurent Destailleur
f87281bfdb
Fix: Add option to avoid reporting by default a total that is false.
2013-01-03 20:42:26 +01:00
Laurent Destailleur
801fd2e0e5
Merge pull request #567 from cbattarel/develop
...
add amount on orders list lines and total at the bottom of table
2013-01-03 11:39:05 -08:00
Regis Houssin
c730aff87b
Fix: possibility to activate jquery plugins with a constant
2013-01-03 19:14:22 +01:00
Regis Houssin
9af8637bd7
Fix: possibility to activate jquery plugins with a constant
2013-01-03 19:13:09 +01:00
fhenry
3e05581c70
Same as last commit
2013-01-03 15:13:07 +01:00
fhenry
f2a4e42712
CheckStyle
...
I check everypalce where this function is call in Dolibarr, and to be
consistant it's better to use new attribute names
2013-01-03 14:44:04 +01:00
Christophe Battarel
1f973548ca
add amount on orders list lines and total at the bottom of table
2013-01-03 11:06:05 +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
b667400cc1
Fix: [ bug #618 ] External accounts can access confidential informations
...
(a lot)
2013-01-02 21:35:28 +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
380d036d5c
Fix: Bad test onto project list id
2013-01-02 15:12:46 +01:00
Laurent Destailleur
cd6e3464db
Fix: Several fixes for bad management of external/internal users.
2013-01-02 14:35:16 +01:00
BENKE Charles
4eab7b004e
Update htdocs/core/boxes/box_activity.php
...
new release with "last 2 year bills"
2013-01-02 11:08:05 +01:00
Laurent Destailleur
049a6dc742
Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3
2012-12-31 14:00:38 +01:00
Laurent Destailleur
dbdc4e6ce8
Fix: Normalize option names
2012-12-31 13:40:13 +01:00
Laurent Destailleur
f7a53eebfb
Fix: Suggested start date of subscription must be validation date.
2012-12-31 13:39:42 +01:00
Marcos García
674034e648
Translated some strings in the code
2012-12-31 05:55:06 +01:00
Marcos García
d7121f6351
Updated demo trigger class with last changes in triggers
2012-12-31 05:30:09 +01:00
Marcos García
93c5acbf39
There's actually no CONTRACT_MODIFY trigger
2012-12-31 05:26:56 +01:00
Marcos García
50975b61b7
Revert "Fixed typo introduced in commit ca2b3f11b166f395e11af74d825989737920e925"
...
This reverts commit a90db96421
2012-12-31 05:22:18 +01:00
Marcos García
adc9897d16
Agenda contacts type wasn't shown in $elementList
2012-12-31 05:10:35 +01:00
Marcos García
3b68faa119
Added missing translations
2012-12-31 05:10:18 +01:00
Marcos García
632b2d7a05
Fixed a bug when modifying a 0% local tax
2012-12-31 04:11:56 +01:00
Marcos García
406ce9e11c
Update changelog + update deprecated triggers in database
2012-12-31 04:11:13 +01:00
Marcos García
a90db96421
Fixed typo introduced in commit ca2b3f11b1
2012-12-31 04:10:48 +01:00
Laurent Destailleur
f345e43dad
Fix: date
2012-12-30 22:23:23 +01:00
Laurent Destailleur
815f43904d
Fix: Warning if setup not complete
2012-12-30 21:56:53 +01:00
Laurent Destailleur
4fe1ba33f9
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
COPYRIGHT
2012-12-30 18:00:07 +01:00
Laurent Destailleur
df43d477fc
Merge pull request #562 from simnandez/3.3
...
Fix: Supplier is mandatory into adding invoice suppliers
2012-12-30 08:38:34 -08:00
Laurent Destailleur
86c9011437
Merge pull request #561 from marcosgdf/3.3
...
Updated changelog + also removed unused triggers when migrating from 3.2.X
2012-12-30 08:36:25 -08:00
Laurent Destailleur
753d79f181
Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3
2012-12-30 17:14:06 +01:00
Laurent Destailleur
0d09de0cf8
Fix: Normalize trigger names for fichinter module.
2012-12-30 17:13:43 +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
a1b0fbcc2c
Fix: [ bug #659 ] Comment in recurrent invoices is not stored
...
Fix: Missing payment mode
2012-12-30 14:14:52 +01:00
Laurent Destailleur
201829e60c
Fix:[ bug #653 ] Error while creating additional attributes
2012-12-30 13:49:37 +01:00
Laurent Destailleur
717657dd05
Fix: [ bug #654 ] Event rapport PDF showing ActionAC_OTH_AUTO
2012-12-30 12:40:32 +01:00
Marcos García
c3a75307b0
Merge branch '3.3' of git://github.com/Dolibarr/dolibarr into 3.3
2012-12-30 12:37:48 +01:00
Laurent Destailleur
ca2b3f11b1
Fix: Several fix in trigger names
2012-12-30 12:24:53 +01:00
Laurent Destailleur
3fb60304db
Fix: Css for ecm module
2012-12-30 12:02:54 +01:00
simnandez
f05176dc8a
Fix: Date is mandatory into adding customer orders
2012-12-30 10:49:11 +01:00
simnandez
9732a2f336
Fix: Supplier is mandatory into adding invoice suppliers
2012-12-30 10:26:18 +01:00
simnandez
f0f45b70da
Fix: Supplier is mandatory into adding invoice suppliers
2012-12-30 10:24:20 +01:00
Laurent Destailleur
b8303bdd5f
Fix: CSS
2012-12-29 23:40:16 +01:00
Marcos García
99bf09dc9e
Updated changelog + also removed unused triggers when migrating from 3.2.x
2012-12-29 18:28:24 +01:00
Laurent Destailleur
2d0dea18ce
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
htdocs/compta/bank/search.php
2012-12-29 17:38:12 +01:00
Laurent Destailleur
703c82f9e2
Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3
2012-12-29 17:35:07 +01:00
Laurent Destailleur
5e05e0aa55
Fix: Trigger names
2012-12-29 17:34:52 +01:00
Laurent Destailleur
a9e9b761cc
Merge pull request #560 from FHenry/develop
...
Fix [ bug #658 ] Seacrh on bank do not work for description
2012-12-29 08:33:17 -08:00
Laurent Destailleur
bc489773e8
Merge pull request #559 from FHenry/3.3
...
Fix [ bug #658 ] Seacrh on bank do not work for description
2012-12-29 08:32:47 -08:00
Laurent Destailleur
1667228d74
Fix: Normalize new trigger names.
2012-12-29 16:42:30 +01:00
Laurent Destailleur
caf4130fb7
Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3
2012-12-29 16:41:28 +01:00
Laurent Destailleur
44fe52d5b2
Fix: Missing field
2012-12-29 16:32:47 +01:00
Laurent Destailleur
35a9fbda59
Merge pull request #556 from marcosgdf/3.3
...
Improved translations
2012-12-29 07:29:29 -08:00
Laurent Destailleur
a84e06cbfc
Merge pull request #555 from simnandez/3.3
...
Trad: Update cashdesk ca_ES and es_ES to spanish rule RD1619/2012
2012-12-29 07:28:55 -08:00
fhenry
5099bc5e89
Fix [ bug #658 ] Seacrh on bank do not work for description
2012-12-29 16:06:11 +01:00
fhenry
32966fe25f
Fix [ bug #658 ] Seacrh on bank do not work for description
2012-12-29 16:02:02 +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
ca6e9643ea
Fix: Pb in json function for objects
2012-12-29 12:21:13 +01:00
Laurent Destailleur
7d60c33c1a
Fix: typo
2012-12-29 12:16:45 +01:00
Laurent Destailleur
17a3204578
Fix: dol_json_encode was wrong with objects
2012-12-29 06:51:12 +01:00
Laurent Destailleur
215139ca72
Fix: Test for css must match test for js
2012-12-29 05:14:07 +01:00
Marcos García
bae8a749b8
Replaced 'Tel' string with 'Phone' to allow translation
2012-12-29 02:51:35 +01:00
Marcos García
4af2a4f875
Improved agenda translations
2012-12-29 02:21:00 +01:00
Laurent Destailleur
6ff9444903
Fix: temporary folder when creating ODT segments on Windows or system…
2012-12-29 01:25:56 +01:00
Marcos García
354c00b9ca
CerfaFR donation template wasn't translating payment mode
2012-12-29 01:13:31 +01:00
Marcos García
316552f4ea
Added missing translation and fixed references to incorrect variable
2012-12-29 00:59:16 +01:00
Marcos García
1b153aef93
Fixed donation payment mode translation and another problem with donation edit form
2012-12-29 00:46:25 +01:00
Marcos García
c8eac78a8d
Translated labels that weren't being translated and improved es_ES translations
2012-12-29 00:24:55 +01:00
Marcos García
7ff5db3385
Improved and added missing es_ES translations
2012-12-29 00:21:50 +01:00
Laurent Destailleur
1722d58196
Fix: Selection of choice in demo page
2012-12-28 22:05:36 +01:00
Laurent Destailleur
2bec26c32a
Fix: Some fix into menu translation
2012-12-28 19:18:04 +01:00
Laurent Destailleur
012ee020a4
Fix: Bad label
2012-12-28 15:48:20 +01:00
simnandez
87434fa9c8
Trad: Update cashdesk ca_ES and es_ES to spanish rule RD1619/2012
2012-12-28 11:41:53 +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
a8012d0f18
Fix: [ bug #617 ] champs non repris lors d'une création de commande à
...
partir d'une propale
2012-12-27 18:02:36 +01:00
Laurent Destailleur
1a530d0ca9
Fix: Broken translation
2012-12-27 17:12:35 +01:00
Laurent Destailleur
ba4be70a5e
Fix: External user was not using correct menu handler.
2012-12-27 17:06:55 +01:00
Laurent Destailleur
f566cd4d99
Fix: Use date of user to define if an action is in past or future.
2012-12-27 15:43:52 +01:00
Laurent Destailleur
251f4f3742
Fix: Avoid duplicate link
2012-12-27 15:33:18 +01:00
Laurent Destailleur
c7b3f2099e
Fix: [ bug #648 ] Warning into instalation
...
Install must use new log modules.
2012-12-27 15:22:40 +01:00
Laurent Destailleur
f9700dc941
Fix: [ bug #651 ] FusionPDF created files cannot be deleted
2012-12-27 14:37:15 +01:00
Laurent Destailleur
fc71073e4e
Fix: Minor fix into user interface
2012-12-27 14:25:52 +01:00
Laurent Destailleur
d4f81a9ee7
Fix: Predefined invoice feature was broken.
2012-12-27 12:51:38 +01:00
Laurent Destailleur
6ba4a22d21
Fix: Migration of payment id not complete
2012-12-27 01:22:00 +01:00
simnandez
a209d5cd55
Fix: Box issues
2012-12-26 12:01:34 +01:00
Laurent Destailleur
3aa9c75b0d
Fix: If thirdparty module not enabled, company and contact fields must
...
not be visibles
2012-12-21 17:56:40 +01:00
Laurent Destailleur
fe469b83ab
Fix: [ bug #641 ] Suppression d'un administrateur
2012-12-21 17:45:13 +01:00
Laurent Destailleur
ec767a9772
Correct path determination if origin is project
2012-12-21 15:39:21 +01:00
Laurent Destailleur
e102592fcd
Merge pull request #551 from simnandez/develop
...
Trad: Add missing credit note payments ca_ES and es_ES translations
2012-12-21 06:35:47 -08:00
Laurent Destailleur
a3f679183f
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2012-12-21 14:26:26 +01:00
Laurent Destailleur
6716003960
Fix: delete
2012-12-21 14:23:48 +01:00
Laurent Destailleur
f1671e5acf
Fix: Remove last chackstyle errors
2012-12-21 11:59:55 +01:00
simnandez
61ee604888
Trad: Add missing credit note payments ca_ES and es_ES translations
2012-12-21 09:27:51 +01:00
Laurent Destailleur
65b59b8d92
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2012-12-21 04:14:24 +01:00
Laurent Destailleur
8f2baf08ac
Fix: Checkstyle
2012-12-21 04:14:02 +01:00
Laurent Destailleur
5dfefa1313
Fix: doxygen
2012-12-20 20:16:10 +01:00
Laurent Destailleur
6b43810881
Merge pull request #550 from simnandez/develop
...
GUI: Amarok disabled buttons more accurated
2012-12-20 10:35:59 -08:00
Laurent Destailleur
1d17d990bd
Fix: Patch from antar3s: Re: Filter on company type in modSociete
2012-12-20 17:42:23 +01:00
simnandez
a10cdcc72e
GUI: Amarok disabled buttons more accurated
2012-12-20 17:16:32 +01:00
Laurent Destailleur
bcd2fead3d
Fix: patch from forum "User permissions on modAgenda"
2012-12-20 17:07:15 +01:00
Laurent Destailleur
e39ec132e5
Fix: Checkstyle
2012-12-19 20:59:08 +01:00
Laurent Destailleur
78a1354a52
Fix: Solve phpunit regression.
...
Include an option to support local tax of type 7 (need more time to
validate this type).
2012-12-19 18:51:49 +01:00
Laurent Destailleur
e9d7a4adc6
Fix: Removed warnings
2012-12-19 15:29:27 +01:00
Laurent Destailleur
11ab579639
Fix: Several fixes to avoid PDF lib conflicts.
2012-12-19 13:06:45 +01:00
Laurent Destailleur
d69e88435c
Add option to have alternative method when ftp does not work
2012-12-18 23:45:51 +01:00
Laurent Destailleur
c0b3690a11
Fix: FTP login
2012-12-18 20:58:50 +01:00
Laurent Destailleur
dff532159d
Fix: FTP modules fails with servers than need passive connection
2012-12-18 18:17:07 +01:00
Laurent Destailleur
6952a5f465
Fix: syntax error
2012-12-18 15:00:35 +01:00
Laurent Destailleur
19d5458ded
Prepare freeze of 3.3
2012-12-18 14:21:56 +01:00
Laurent Destailleur
6b01c45210
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2012-12-18 13:14:29 +01:00
Laurent Destailleur
4cc44292e7
Fix: Maxi debug of holiday module
2012-12-18 13:12:11 +01:00
Regis Houssin
fb0869e0d0
Merge pull request #549 from jfefe/webservices
...
New webservice method to create a thirdparty with contact and user
2012-12-18 02:49:45 -08:00
jfefe
0d8969e2a6
New webservice method to create a thirdparty with contact and user
2012-12-18 11:17:46 +01:00
Laurent Destailleur
7cbd938c9c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2012-12-18 10:10:19 +01:00
Laurent Destailleur
e4b4f459da
Fix: Missing drop of table deprecated into 3.2
2012-12-18 10:10:04 +01:00
simnandez
c70bba3a57
Fix: showrefnav fails with multicompany
2012-12-18 09:01:04 +01:00
Laurent Destailleur
752aabfc86
Fix: dynamic menu does not works with auguria. Add a temporary fix.
2012-12-17 23:19:48 +01:00
Laurent Destailleur
515f30591d
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2012-12-17 15:48:16 +01:00
Laurent Destailleur
7cf47b2e24
Fix: Missing translation
2012-12-17 15:47:01 +01:00
fhenry
2d2aaad1b0
Manage Extrafields deletion for contact
2012-12-16 23:18:20 +01:00
Laurent Destailleur
a83329f6c1
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2012-12-16 19:46:33 +01:00
Laurent Destailleur
5cf07a214c
Fix: Close db at wrong place
2012-12-16 19:42:58 +01:00
Laurent Destailleur
4ad38f91fa
Merge pull request #544 from simnandez/develop
...
Qual: Delete unused files of the amarok theme
2012-12-16 10:28:03 -08:00
Regis Houssin
65090c582d
Fix: checkstyle
2012-12-15 11:39:47 +01:00
Regis Houssin
bbbfc8c018
Merge pull request #545 from ricardosequeira/develop
...
Develop
2012-12-14 19:23:46 -08:00
simnandez
a528c7786c
Qual: Delete unused files of the amarok theme
2012-12-14 23:21:42 +01:00
Laurent Destailleur
5a99076cf5
Fix: Clean amarok style. Removed hard coded length of close cells.
2012-12-14 18:35:50 +01:00
Laurent Destailleur
0c0653b3d8
Fix: Removed rubbish line
2012-12-14 18:34:24 +01:00
Laurent Destailleur
cfa52f7ff3
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2012-12-14 17:56:49 +01:00
Laurent Destailleur
c36d013971
Fix: Link missing
2012-12-14 17:55:42 +01:00
simnandez
e1a8368c28
GUI: Amarok buttons black label are most visible
2012-12-14 17:10:39 +01:00
simnandez
d934aa12a9
GUI: Amarok improved login screen
2012-12-14 17:05:56 +01:00
Laurent Destailleur
7b1ed60375
It is better to use external link instead of adding hard coded
...
list.
2012-12-14 14:39:22 +01:00
simnandez
c05ed2a146
GUI: Update amarok theme to work into 3.3
2012-12-14 13:01:57 +01:00
fhenry
0e1d83c698
Change sample data for createThirdParty
2012-12-13 19:58:36 +01:00
fhenry
d03d81a174
Merge remote-tracking branch 'origin/develop' into develop
2012-12-13 19:47:27 +01:00
fhenry
ff5f01646a
Web Service Agenda/Actioncomm with extrafields
2012-12-13 19:11:03 +01:00
fhenry
605d236ecc
WebService Agenda/Actioncomm
2012-12-13 19:09:40 +01:00
fhenry
0f07297329
variable spelling error
2012-12-13 17:33:53 +01:00
Regis Houssin
b09a44701e
Fix: wrong EOL
2012-12-13 13:08:03 +01:00
fhenry
3fc51c2786
Commit without password
2012-12-13 12:50:52 +01:00
fhenry
14c1616adb
Full standard extrafields management in Thirds Party Web service
2012-12-13 12:34:00 +01:00
Regis Houssin
5f41174cfa
Fix: bad path for photo and uniformize code
2012-12-13 11:42:59 +01:00
Laurent Destailleur
57742b347a
Fix: Bad position of field with non A4 pages
2012-12-12 20:58:49 +01:00
Laurent Destailleur
a11e4b5124
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2012-12-12 19:02:38 +01:00
Laurent Destailleur
c107697dc1
Fix: Var not always initialized
2012-12-12 18:14:21 +01:00
simnandez
8ac17c8206
Trad: Fix typo error into es_ES
2012-12-12 17:12:50 +01:00
simnandez
7cbcd1fc5d
Fix: Withdrawal spanish generation adapted to new AEAB rule: profid1 is
...
mandatory
2012-12-12 17:00:29 +01:00
simnandez
488d482508
Fix: Withdrawal spanish generation adapted to new AEAB rule: profid1 is
...
mandatory
2012-12-12 16:57:53 +01:00
Laurent Destailleur
e2e86e16d0
Merge pull request #537 from grandoc/develop
...
Develop
2012-12-12 07:01:54 -08:00
Laurent Destailleur
13d5a2e12c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2012-12-12 14:46:33 +01:00
Laurent Destailleur
bdb112c820
Fix: Using bad root url.
2012-12-12 14:46:13 +01:00
Laurent Destailleur
411bdfda5f
Merge pull request #538 from simnandez/develop
...
Fix: Use transcountry instead trans for localtaxes label
2012-12-12 05:41:56 -08:00
Laurent Destailleur
2c2465ffad
Comment to make test
2012-12-12 13:14:28 +01:00
simnandez
614a8e48a2
Fix: Use transcountry instead trans for localtaxes label
2012-12-12 12:40:30 +01:00
Grand Philippe
993e484bdd
prepare multi-user event
2012-12-12 12:17:56 +01:00
Laurent Destailleur
4413c0a5a7
Fix: upload user file
2012-12-12 11:57:56 +01:00
Laurent Destailleur
5d370c7e96
Fix: force redirect to https could not work for some environments
2012-12-12 02:37:15 +01:00
Laurent Destailleur
0128cc36c8
Fix: url example
2012-12-12 01:57:52 +01:00
Laurent Destailleur
caf897cfa7
Clean code to help debug pb with payment methods.
2012-12-12 01:49:23 +01:00
Laurent Destailleur
a972199296
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2012-12-12 00:51:15 +01:00
Laurent Destailleur
38b1c540ef
Fix: Bad url forging
2012-12-12 00:49:32 +01:00
Grand Philippe
dc0558989b
Merge remote-tracking branch 'origin/develop' into develop
2012-12-11 19:04:54 +01:00
Laurent Destailleur
7c19fc97b8
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2012-12-11 18:05:39 +01:00
Christophe Battarel
27670d62ba
fix missing $conf global var in llxHeader() function
2012-12-11 15:14:43 +01:00
Laurent Destailleur
cee805f473
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2012-12-11 11:00:37 +01:00
Laurent Destailleur
080276a504
Fix: bad escape function. email missing
2012-12-11 10:59:03 +01:00
Laurent Destailleur
1c02dc4f9d
Fix: better translation
2012-12-11 10:50:35 +01:00
Laurent Destailleur
f4459ee1f1
Fix: Regression detected by PHPUnit
2012-12-10 19:06:59 +01:00
Laurent Destailleur
43fe5766a1
New: Holiday need to support half day to be usefull.
2012-12-10 16:10:08 +01:00
Grand Philippe
a91a96e72e
merge
2012-12-10 10:02:13 +01:00
Laurent Destailleur
8e764e88e6
Update TCPF
...
Added japanese font files.
2012-12-10 01:47:39 +01:00
Laurent Destailleur
ab5998d32f
Fix: japanese language
2012-12-10 01:42:25 +01:00
Ricardo Sequeira
cf3831d4da
Improved translation
2012-12-09 21:17:59 +00:00
Laurent Destailleur
21bd9bf749
Merge pull request #533 from FHenry/develop
...
comment
2012-12-09 11:56:54 -08:00
Laurent Destailleur
5931df82c6
Qual: Clean code to make choice of default value easier.
2012-12-09 20:54:45 +01:00
Laurent Destailleur
70be706347
New: Add greece regions and provinces
2012-12-09 20:01:16 +01:00
fhenry
adcb70eafa
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2012-12-09 19:13:47 +01:00
Laurent Destailleur
773e3decf6
Fix: typo
2012-12-09 18:50:10 +01:00
Laurent Destailleur
c44481fb91
Normalize key name
2012-12-09 18:47:23 +01:00
Laurent Destailleur
f4def0cd89
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2012-12-09 18:45:03 +01:00
Laurent Destailleur
03cacbcd1d
Ignore external modules
2012-12-09 18:44:31 +01:00
Laurent Destailleur
f47422f551
Fix: Errors into turnover reports
2012-12-09 18:40:01 +01:00
Laurent Destailleur
77ca4241a5
New: Can input a payment back onto an credit note.
2012-12-09 18:39:42 +01:00
fhenry
ec09f79a2f
comment
2012-12-08 19:23:13 +01:00
Regis Houssin
158f581f03
Merge pull request #532 from FHenry/develop
...
prepare module for "Single login at one time"
2012-12-08 10:09:29 -08:00
fhenry
0e76875e9c
prepare single login at one time
2012-12-08 18:41:32 +01:00
Laurent Destailleur
8a5485c9b6
New: Skin can be personalized according to environment.
2012-12-08 18:38:14 +01:00
Laurent Destailleur
cd676b323d
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2012-12-08 18:32:18 +01:00
fhenry
4570c57bfd
Change-Id: I003fa45e6e932350b9d21b00ed4817b943470223
2012-12-08 18:28:19 +01:00
fhenry
131dc88139
prepare module for "Single login at one time"
2012-12-08 18:14:13 +01:00
Laurent Destailleur
c3e3595d9c
Look: Uniformize style
2012-12-08 17:42:08 +01:00
Laurent Destailleur
3ec2ea0b25
Fix: More complete system info
2012-12-08 17:14:51 +01:00
fhenry
b3d21a4320
Fix [ bug #634 ] Install faild on PostGreSQL
...
Fix [ bug #631 ] Index Creation failed on fresh install with PostgreSQL
2012-12-08 17:01:07 +01:00
fhenry
dbe00e9fbd
Better bahaviour for pgSQL autoupdate trigger
2012-12-08 16:01:05 +01:00
Laurent Destailleur
58118bb366
Fix: error during include when multicompany module enabled.
2012-12-08 15:35:08 +01:00
Laurent Destailleur
ac3eb2e86c
Fix: Use different css cache file for each user. This fix problem when
...
using personalised constants that change style.
2012-12-08 15:29:24 +01:00
Laurent Destailleur
afb45e1b31
Comment
2012-12-08 15:26:27 +01:00
Regis Houssin
bfd44da265
Merge pull request #529 from FHenry/develop_extrafielddeletion
...
Extrafield remove and PgSQL field tms convertion
2012-12-08 05:41:41 -08:00
Laurent Destailleur
6a60b78b28
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2012-12-08 14:25:36 +01:00
Laurent Destailleur
b119ab5539
Prepare 3.3 freeze.
2012-12-08 14:24:57 +01:00
fhenry
1d6bc23f4d
- Uniformize Extrafield deletion for adherent,user,product,societe by
...
using commonobject method
- Add convertion of tms timestamp special case in mysql for pgsql
2012-12-08 14:23:52 +01:00
Laurent Destailleur
db91526643
Fix: Solve conflict into migration/backup/restore (child tables
...
must be after parent tables).
Fix: Migration of old version
2012-12-08 14:16:39 +01:00
fhenry
574a950dc6
Add third party extrafield in web service exposure
2012-12-08 13:30:39 +01:00
fhenry
99f01f1dca
[Task 632] : Add standard extra field feature for Agenda
2012-12-08 12:49:20 +01:00
Regis Houssin
9bc32b1b70
Merge pull request #524 from simnandez/develop
...
Trad: Fix ca_ES and es_ES translations
2012-12-08 01:47:25 -08:00
Regis Houssin
4e79a445c5
Merge pull request #522 from atm-maxime/develop
...
Fix : minor html fix + changelog
2012-12-08 01:46:59 -08:00
simnandez
5778683849
Trad: Fix ca_ES and es_ES translations
2012-12-07 17:13:09 +01:00
Regis Houssin
f984b669b2
Fix: Fix: Use another method to help avoid having a space in value in
...
order to use this value with jquery
2012-12-07 13:48:11 +01:00
Maxime Kohlhaas
4cffe3e5a3
Fix : minor html fix + changelog
2012-12-07 11:06:51 +01:00
Regis Houssin
be7d545297
Fix: wrong variable name
2012-12-07 10:50:16 +01:00
Regis Houssin
8ea3614a3c
Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop
2012-12-07 10:48:10 +01:00
Regis Houssin
7ff3002993
Fix: Check if amount is numeric, for example, an error occured when
...
amount value = o (letter) instead 0 (number)
2012-12-07 10:47:36 +01:00
Laurent Destailleur
41302b7b75
Merge pull request #521 from grandoc/develop
...
fix : typo
2012-12-06 11:15:10 -08:00
Laurent Destailleur
3858085a7f
Add option MAIN_HELPCENTER_LINKTOUSE to define target link "I need help"
...
onto logon page.
2012-12-06 17:59:37 +01:00
Grand Philippe
c6a3add952
fix : typo
2012-12-06 17:09:12 +01:00
Regis Houssin
50206bbd73
Fix: avoid errors
2012-12-06 10:43:27 +01:00
Laurent Destailleur
2cfd8fbd64
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2012-12-05 21:32:49 +01:00
Laurent Destailleur
7250592d0c
Code comments
2012-12-05 21:32:18 +01:00
Christophe Battarel
bbc470b3ae
add search box to find product by supplier ref
2012-12-05 19:56:23 +01:00
Christophe Battarel
88db3da002
allowing product search by supplier ref
2012-12-05 19:51:25 +01:00
Christophe Battarel
b68153ce9a
add button in order to create intervention from services ordered
2012-12-05 19:07:07 +01:00
Christophe Battarel
0c064c777a
add ability to fichinter to be created from an order (services only)
2012-12-05 19:01:18 +01:00
Christophe Battarel
2a4261db28
add linked object storage in fichinter
2012-12-05 18:48:02 +01:00
Laurent Destailleur
db2eb79f34
Merge pull request #517 from atm-maxime/develop
...
Fix : on supplier bill validation, question about stock was asking for s...
2012-12-05 07:14:05 -08:00
Maxime Kohlhaas
64f5d59ddf
Fix : on supplier bill validation, question about stock was asking for stock decrease instead of increase
2012-12-05 15:42:59 +01:00
Regis Houssin
136f454111
Merge pull request #516 from atm-maxime/develop
...
Trans : counter to 0 every month translations
2012-12-05 06:02:18 -08:00
Maxime Kohlhaas
2824278414
Trans : counter to 0 every month translations
2012-12-05 14:56:29 +01:00
Maxime Kohlhaas
5992ebcdbc
New : option to reset numbering to 0 every month using @99 in the mask
2013-02-06 11:52:49 +01:00
Laurent Destailleur
4a5062283d
Merge pull request #515 from atm-maxime/develop
...
New : option to reset numbering to 0 every month using @99 in the mask
2012-12-05 04:19:16 -08:00
Regis Houssin
a4f0b7f0df
Fix: avoid error with external modules
2012-12-05 11:36:10 +01:00
Regis Houssin
3d4621327c
Fix: EOL !! tant que ce problème sera présent, les risques de problèmes
...
de merge et de conflits sera présent !! il faut utiliser la dernière
version d'Eclipse et de Egit...
2012-12-05 11:18:45 +01:00
Regis Houssin
644a05f6dc
Merge pull request #457 from atm-maxime/mko559
...
Task # 559 : price by quantity
2012-12-05 00:15:27 -08:00
Maxime Kohlhaas
954a578ebd
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko559
...
Conflicts:
htdocs/install/mysql/migration/3.2.0-3.3.0.sql
2012-12-05 09:10:55 +01:00
jfefe
9a8f81c740
Remove deprecated fields
...
fix : data is an array, not an object
2012-12-05 06:42:05 +01:00
jfefe
8ae10ef9f0
New webservice methods for contact :
...
- new method to get contact info
- new method to create a contact
- new method to get a list of contact for a thirdparty
2012-12-05 03:47:25 +01:00
jfefe
771634c66b
Add contact info when get an user by webservice
2012-12-05 02:11:11 +01:00
Laurent Destailleur
bee97a6b3b
Restore another lost commit.
...
Fix: Restore compatibility with FPDF.
Conflicts:
htdocs/core/lib/pdf.lib.php
2012-12-05 00:47:20 +01:00
Laurent Destailleur
5d27fd61df
Beautify instal pg.
...
Fix: Debian package
Restore PHPUnit test (A PHP Unit test that fails should not be removed
but fixed and be kept in error until fix is published. Otherwise,
PHPUnit are useless).
Conflicts:
htdocs/install/fileconf.php
htdocs/install/inc.php
2012-12-05 00:45:10 +01:00
Laurent Destailleur
e3d07621eb
Fuck git. Restore another lost commit.
2012-12-04 20:51:45 +01:00
Laurent Destailleur
b0b0f06655
Fix: Removed useless code
2012-12-03 20:23:16 +01:00
Laurent Destailleur
9b9b8b4156
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2012-12-03 20:19:53 +01:00
Laurent Destailleur
bac4bf07a3
New: Add patch from pgrand to start link of several contacts onto an
...
event
2012-12-03 20:19:35 +01:00
Regis Houssin
a0bed6c47f
Fix: For avoid conflicts with external modules
2012-12-03 17:29:08 +01:00
Regis Houssin
4388be7295
FIXME $ident is not defined
2012-12-03 17:16:04 +01:00
Regis Houssin
c0fba8262f
FIXME pending correction of the "addline" method
2012-12-03 11:20:03 +01:00
Regis Houssin
9079c1fb3b
Fix: phpunit error
2012-12-03 09:58:18 +01:00
Laurent Destailleur
7d8c0837b6
Restore another lost commit.
2012-12-02 19:45:35 +01:00
Laurent Destailleur
518b169a89
Increase field size (some system need to store an url here)
2012-12-02 19:41:49 +01:00
Laurent Destailleur
7b824665a5
Revert "Increase field size (some system need to store an url here)"
...
This reverts commit 7ade37831e
2012-12-02 19:41:06 +01:00
Laurent Destailleur
7ade37831e
Increase field size (some system need to store an url here)
2012-12-02 19:33:39 +01:00
Laurent Destailleur
86e08e87d5
Fix: date format
2012-12-02 18:21:26 +01:00
Laurent Destailleur
fd22705de4
New: Log handler can now manage indent on database transactions
2012-12-02 15:20:45 +01:00
Laurent Destailleur
d578d0be2b
Perf: Log optimize. Saved 10KB of memory.
2012-12-02 14:33:24 +01:00
Laurent Destailleur
d428549e15
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2012-12-02 13:51:52 +01:00
Laurent Destailleur
938dc92ab6
Qual: More complete error management into delete methods
2012-12-02 13:51:33 +01:00
Laurent Destailleur
6fcc32b326
Comments
2012-12-02 12:59:06 +01:00
Regis Houssin
00aa22e1d7
Fix: wrong EOL
2012-12-02 11:03:23 +01:00
Christophe Battarel
c3aa626e18
function getTypeOfLocalTaxFromRate now receives thirdparty in parameter and returns array of localtax type and amount/rate. no more sql in pdf model.
2012-12-02 10:52:53 +01:00
Christophe Battarel
f0e75bf11a
dont use ES translation for labels
2012-12-02 10:52:04 +01:00
Christophe Battarel
785491ca2c
add function gettypeoflocaltax and modify pdf models
2012-12-02 10:51:18 +01:00
Christophe Battarel
8544003d7b
remove unused arrays into pdf models (localtaxes)
...
Conflicts:
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
Change-Id: I633bfc4b0ec39f9121662d0f876f1edb36173e8e
2012-12-02 10:49:29 +01:00
Christophe Battarel
093468420a
show local taxes on crabe pdf model
2012-12-02 10:42:24 +01:00
Laurent Destailleur
09bb10b2a6
Restore lost commit
2012-12-01 15:50:39 +01:00
simnandez
3ab0b26d00
Trad: Update ca_ES and es_ES profid of countries
2012-12-01 15:47:52 +01:00
simnandez
c365dbc679
New: [ task #314 ] Can define if prof id are mandatory or not
2012-12-01 15:47:39 +01:00
simnandez
4f2f56fced
New: [ task #314 ] Can define if prof id are mandatory or not
2012-12-01 15:47:33 +01:00
simnandez
d8651ca830
Trad: Add missing margins translations
2012-12-01 15:47:28 +01:00
simnandez
d14308e07d
Trad: Add ca_ES and es_ES missing translations
2012-12-01 15:47:22 +01:00
simnandez
af304638c8
Fix: Add to areas not working if we navigate with shownavref
2012-12-01 15:47:16 +01:00
Laurent Destailleur
4136c27516
RESTORE CODE WITH ID D2adaf7. The Merge daacf79 as lost more than 50
...
commits !
2012-12-01 15:45:05 +01:00
Maxime Kohlhaas
69fa1e9d10
Fix : replace PRODUIT_PRICE_BY_QTY by PRODUIT_CUSTOMER_PRICES_BY_QTY
2012-12-01 14:38:59 +01:00
Maxime Kohlhaas
e45438994c
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko559
...
Conflicts:
htdocs/install/mysql/migration/3.2.0-3.3.0.sql
2012-12-01 14:36:51 +01:00
Laurent Destailleur
bba1492621
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2012-12-01 12:23:12 +01:00
Laurent Destailleur
d30b74e69e
Merge pull request #508 from simnandez/develop
...
Fix: Add to areas not working if we navigate with shownavref
2012-12-01 02:56:11 -08:00
Laurent Destailleur
daacf797c4
Merge pull request #500 from cbattarel/develop
...
[Task #204 ] more local taxes manangement
2012-12-01 02:49:45 -08:00
Laurent Destailleur
d2adaf7fdc
Merge pull request #506 from FHenry/develop
...
Add import_key attribute into contact class creation SQL request
2012-12-01 02:49:24 -08:00
Laurent Destailleur
31b37c5aff
Fix: Length not hard coded
2012-12-01 11:31:02 +01:00
simnandez
a2123d0fe9
Trad: Update ca_ES and es_ES profid of countries
2012-11-30 21:49:27 +01:00
simnandez
b4e16827dc
New: [ task #314 ] Can define if prof id are mandatory or not
2012-11-30 21:23:12 +01:00
Laurent Destailleur
624c0fa040
Fix: Restore compatibility with FPDF.
2012-11-30 20:31:43 +01:00
Laurent Destailleur
9d17b8f96c
Fix: Label not complete
2012-11-30 19:39:22 +01:00
simnandez
6487baa081
New: [ task #314 ] Can define if prof id are mandatory or not
2012-11-30 18:46:05 +01:00
simnandez
dda12c3d70
Trad: Add missing margins translations
2012-11-30 17:58:12 +01:00
simnandez
f0ba52445d
Trad: Add ca_ES and es_ES missing translations
2012-11-30 17:36:48 +01:00
simnandez
dbf1a727be
Fix: Add to areas not working if we navigate with shownavref
2012-11-30 16:20:01 +01:00
Laurent Destailleur
008f5fbcfc
New: extrafields are available onto users cards.
2012-11-30 15:55:59 +01:00
Christophe Battarel
b70df3762c
Merge branch 'develop' of https://github.com/cbattarel/dolibarr into develop
2012-11-30 10:58:57 +01:00
Christophe Battarel
04718b1832
resolve conflict
2012-11-30 10:57:42 +01:00
fhenry
f7b6f44767
oops, correct version
2012-11-30 04:51:11 +01:00
fhenry
1315e9a2ba
Add import_key attribute into contact class creation SQL request
2012-11-30 04:40:06 +01:00
Regis Houssin
75fa37cde9
Fix: avoid warning in strict mode
2012-11-30 00:41:31 +01:00
Regis Houssin
c37ebea688
Fix: use $object->id instead $id for security
2012-11-30 00:35:38 +01:00
Regis Houssin
969b510a6a
Fix: best method
2012-11-30 00:29:13 +01:00
Regis Houssin
5d1b5d5e0c
Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop
2012-11-30 00:06:54 +01:00
Regis Houssin
31785c8868
Fix: uniformize code
2012-11-30 00:06:25 +01:00
Laurent Destailleur
2ccf9462e4
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2012-11-29 23:12:31 +01:00
Laurent Destailleur
b12469c562
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/holiday/fiche.php
2012-11-29 23:12:16 +01:00
Laurent Destailleur
b507c12b13
Merge pull request #503 from atm-maxime/mko608
...
Qual : remove multi fetch
2012-11-29 14:08:03 -08:00
Laurent Destailleur
49a6c661fd
Merge pull request #505 from FHenry/develop
...
Fix installation error Erreur SQL : DB_ERROR_SYNTAX - insert into
2012-11-29 14:07:47 -08:00
Laurent Destailleur
d5de68b985
Merge pull request #504 from simnandez/develop
...
Qual: Uniformize withdrawals tabs
2012-11-29 14:05:13 -08:00
Laurent Destailleur
184cced303
New: Implement all call to allow to remove a tab by an external module
2012-11-29 23:02:02 +01:00
fhenry
a49bf61f33
Add AGENDA_USE_EVENT_TYPE configuration into Agande module configuration
2012-11-29 19:09:36 +01:00
Regis Houssin
3005a4f7cf
Fix: use specific code for avoid conflict
2012-11-29 18:37:37 +01:00
Regis Houssin
ffbeb38747
Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop
2012-11-29 18:31:00 +01:00
Regis Houssin
583dfb225c
New: add possibility to force label of buttons and hide the second
...
button for dialog info only
2012-11-29 18:30:16 +01:00
fhenry
c3ced863c1
Fix installation error Erreur SQL : DB_ERROR_SYNTAX - insert into
...
llx_c_actioncomm (id, code, type, libelle, module, active, position)
values ( 5, 'AC_RDV', 'system', 'Rendez-vous' ,NULL, ,1 1); - You have
an error in your SQL syntax; check the manual that corresponds to your
MySQL server version for the right syntax to use near '1 1)' at line 1
2012-11-29 17:59:28 +01:00
Laurent Destailleur
17e0aedebb
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2012-11-29 13:20:53 +01:00
Laurent Destailleur
a62f2a7c8d
New: Add vat rate for south africa.
2012-11-29 12:53:12 +01:00
Christophe Battarel
51d87f8f4a
function getTypeOfLocalTaxFromRate now receives thirdparty in parameter and returns array of localtax type and amount/rate. no more sql in pdf model.
2012-11-29 11:36:59 +01:00
Regis Houssin
36ca334821
FIXME: this return create an error in jenkins
2012-11-29 10:43:05 +01:00
Regis Houssin
d97f1937f8
Fix: UPGRADE ECLIPSE AND EGIT WITH THE LAST VERSION PLEASE !!!!
2012-11-29 10:25:33 +01:00
Regis Houssin
88fcfa9533
Fix: uniformize code
2012-11-29 10:23:47 +01:00
Maxime Kohlhaas
e3d6b0dd9e
Fix : remove print_r...
2012-11-29 09:52:20 +01:00
simnandez
f348fabf4d
Qual: Uniformize withdrawals tabs
2012-11-29 09:34:10 +01:00
Laurent Destailleur
e62b3acef6
Fix: Translation
2012-11-29 01:59:31 +01:00
Laurent Destailleur
0b05d12e84
Fix: Bad picto
2012-11-29 01:27:24 +01:00
Laurent Destailleur
3d10689eca
Qual: Maxi debug of withdrawal module. It is possible to understand how
...
it works now !
2012-11-29 01:18:57 +01:00
Maxime Kohlhaas
19f3866b05
Fix : have to fetch object after create to reload values + thirdparty must be loaded if mode = create
2012-11-29 01:05:45 +01:00
Maxime Kohlhaas
1fc35d7d42
Fix : value returned after order confirm was 0 if update OK, and order page wasn't reloaded
2012-11-29 00:38:39 +01:00
Maxime Kohlhaas
0587b06cf4
Fix : global error print + no use of & for affectation
2012-11-29 00:20:24 +01:00
Laurent Destailleur
60fc84a4d9
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2012-11-29 00:07:21 +01:00
Laurent Destailleur
91e6087d1b
Perf: Try to reduce amount of memory used to show events
2012-11-29 00:07:05 +01:00
Laurent Destailleur
9f02b6e5ac
Merge pull request #502 from simnandez/develop
...
Trad: Add ca_ES and es_ES missing translations
2012-11-28 10:43:33 -08:00
Laurent Destailleur
8212700c41
Fix: EOL
2012-11-28 19:25:12 +01:00
Laurent Destailleur
b45ef4b578
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2012-11-28 19:19:56 +01:00
Laurent Destailleur
effe169850
Fix: pdf_getPDFFontSize must be after pdf_getInstance
2012-11-28 19:19:39 +01:00
simnandez
740810abca
Fix: Select of notifications events is showed in french
2012-11-28 18:35:00 +01:00
simnandez
5c86d21941
Fix: Select of notifications events is showed in french
2012-11-28 18:31:52 +01:00
Maxime Kohlhaas
a6b6085772
Qual : remove multi fetch
2012-11-28 18:13:02 +01:00
simnandez
f70bbded5f
Trad: Add ca_ES and es_ES missing translations
2012-11-28 18:12:18 +01:00
Christophe Battarel
53cf2ca8f5
dont use ES translation for labels
2012-11-28 17:57:17 +01:00
Christophe Battarel
e459736977
add function gettypeoflocaltax and modify pdf models
2012-11-28 17:47:15 +01:00
Maxime Kohlhaas
a9941480f1
Fix : contact default country
2012-11-28 15:34:42 +01:00
Maxime Kohlhaas
2f743cd7f8
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
2012-11-28 15:32:27 +01:00
Laurent Destailleur
b1c13e373a
Fix: A better fix to remove fk_pays.
2012-11-28 15:31:55 +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
9139427d7f
Fix: Country default not selected
2012-11-28 14:51:39 +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
cbdcb50ce2
Merge pull request #499 from cbattarel/develop
...
show local taxes on invoice
2012-11-28 03:11:07 -08:00
Christophe Battarel
12284bf676
show local taxes on invoice
2012-11-28 12:04:31 +01:00
Laurent Destailleur
8fdf4aaf3b
Merge pull request #498 from FHenry/develop
...
Add cancel button (go bask -1 history)
2012-11-28 02:37:00 -08:00
Laurent Destailleur
2b51132b32
Translation of localtax admin.
2012-11-28 11:34:52 +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
925e59e246
Fix : default country on contact creation was not set properly
2012-11-28 11:04:54 +01:00
fhenry
fca43941b0
Add cancel button (go bask -1 history)
2012-11-28 10:57:55 +01: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
e8e4cc08de
show localtaxes in order
2012-11-28 10:35:16 +01:00
Christophe Battarel
0e144dd7c3
fix wrong test for localtax assuj check
2012-11-28 10:32:24 +01:00
Christophe Battarel
f00b4b5527
correction to allow global local tax (type 7) on localtax1
2012-11-28 10:24:40 +01:00
Christophe Battarel
cee8e16e7e
correct wrong check for localtaxes
2012-11-28 09:32:41 +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
Laurent Destailleur
7ee2ce3c21
Merge pull request #492 from atm-maxime/mko527
...
New : go directly into supplier invoice number field after cloning
2012-11-27 11:08:14 -08:00
Laurent Destailleur
da9ac187dd
Merge pull request #493 from atm-maxime/mko545
...
Qual : clean unused code
2012-11-27 11:08:01 -08:00
Laurent Destailleur
53d997f59b
Merge pull request #494 from atm-maxime/mko608
...
Task # 608 : add clone function on supplier order
2012-11-27 11:07:03 -08:00
fhenry
5c94912e66
Add datehourpicker in editfieldval method to allow display of hour
2012-11-27 18:35:51 +01:00
simnandez
0bed303596
Trad: Added english (arabi saudia) into ca_ES and es_ES
2012-11-27 17:54:42 +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
3b8f002e4f
display of total local taxes
2012-11-27 15:37:16 +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
a495bcefaa
Fix: language translation for araby saudia
2012-11-27 14:13:42 +01:00
Laurent Destailleur
49730ac24f
Code comments only
2012-11-27 13:58:06 +01:00
Christophe Battarel
e919ce893a
check if company has localtaxes for its country
2012-11-27 13:05:21 +01:00
Laurent Destailleur
6c9d6eda56
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2012-11-27 09:34:34 +01:00
Laurent Destailleur
959e061373
Added english (arabi saudia)
2012-11-27 09:34:14 +01:00
Laurent Destailleur
3f64b533f4
Fix: [ bug #607 ] Nom de société avec guillemets
2012-11-26 16:06:50 +01:00
Laurent Destailleur
4abae05c26
Qual: Uniformize behaviour of product selection
2012-11-26 13:37:40 +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
Ricardo Sequeira
4be60985bf
Translation improved
2012-11-25 21:48:39 +00:00
Laurent Destailleur
6c8b00b82f
Fix: Removed duplictae key
2012-11-25 21:00:51 +01:00
Laurent Destailleur
3de396afa6
Fix: Class not found
2012-11-25 20:42:53 +01:00
Laurent Destailleur
b977ea5d87
Fix: Regression. Show bad error message when we add a product with no
...
prices defined.
2012-11-25 20:38:39 +01:00
Ricardo Sequeira
1f5b23ae39
Improved Translation
2012-11-25 16:04:08 +00:00
Ricardo Sequeira
73d4c92fa3
Improved translation
2012-11-24 20:07:54 +00:00
Ricardo Sequeira
ec96490710
Improved translation
2012-11-24 16:44:25 +00:00
Ricardo Sequeira
4b6393c175
Improved translation
2012-11-24 15:32:38 +00:00
Ricardo Sequeira
e26880a455
Improved translation
2012-11-24 15:10:47 +00:00
Maxime Kohlhaas
437d082308
Fix : multicompany comptability
2012-11-24 00:06:54 +01:00
Ricardo Sequeira
be9e3e4b30
Translation improved
2012-11-23 17:10:11 +00:00
Maxime Kohlhaas
3306d91ce1
Task # 608 : forgot to clone lines... Now lines are also cloned and prices are valid prices at the clone date
2012-11-23 09:00:17 +01:00
Maxime Kohlhaas
0bb3f766f6
New : Add clone function on supplier order + global object fetch instead of each case
2012-11-22 23:38:35 +01:00
Maxime Kohlhaas
5c9058e688
Qual : clean unused code
2012-11-22 21:56:06 +01:00
Maxime Kohlhaas
ba3ae073d7
New : go directly into supplier invoice number field after cloning
2012-11-22 19:59:31 +01:00
Maxime Kohlhaas
0d6aee24f3
Fix : table displayed not like others
2012-11-22 16:35:51 +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
35a887f869
Clean code
2012-11-21 20:24:15 +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
e6d7ce1ab6
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2012-11-21 19:04:51 +01:00
Laurent Destailleur
c49fea217f
Fix: Another fix on sql request generation.
2012-11-21 19:00:06 +01:00
Regis Houssin
ce4feffd1f
Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop
2012-11-21 18:56:07 +01:00
Regis Houssin
31ecc1987e
Fix: remove old code
2012-11-21 18:52:25 +01:00
Laurent Destailleur
06a8ba2be2
Fix: for combo list that use text key.
2012-11-21 18:51:49 +01:00
Laurent Destailleur
6a11016a21
Fix: var_dump must be commented
2012-11-21 18:45:52 +01:00
Laurent Destailleur
66cf1419ca
Fix: llx_c_paper_format dictionnary was not up to date.
2012-11-21 17:48:27 +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
6db5185d7e
Fix: Missing include
2012-11-20 23:57:35 +01:00
Laurent Destailleur
733214733e
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2012-11-20 17:46:44 +01:00
Laurent Destailleur
6c4e1caa04
Merge pull request #491 from simnandez/develop
...
Trad: Add ca_ES and es_ES translations
2012-11-20 08:34:45 -08:00
Laurent Destailleur
28e95231c0
Merge pull request #483 from atm-maxime/develop
...
Warning on proposal home pages
2012-11-20 08:34:15 -08:00
Laurent Destailleur
8f0b548714
Debug export filters. Seems to be enougth stable so it is now enabled by
...
default.
2012-11-20 15:56:44 +01:00
Laurent Destailleur
d9cdb542d5
Debug filter during export
2012-11-20 14:07:52 +01:00
Laurent Destailleur
2e0554bfbd
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2012-11-20 13:36:03 +01:00
Laurent Destailleur
ddb3cf6f42
Fix: Debug holiday module
2012-11-20 13:14:16 +01:00
Regis Houssin
babda1d7df
Fix: increase field size for GB sort code (xx-xx-xx)
2012-11-20 12:43:00 +01:00
Laurent Destailleur
005716af99
Fix: Missing includes
2012-11-20 12:40:57 +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
6a97a45111
Qual: Rename translation key
2012-11-20 11:27:50 +01:00
Laurent Destailleur
e53f6a383d
Fix: Removed a hard coded error code.
2012-11-20 11:23:34 +01:00
Laurent Destailleur
8d50def412
Sec: Do not init password by default when install pages are recalled
2012-11-20 11:22:57 +01:00
simnandez
b593fa2df6
Trad: Add ca_ES and es_ES translations
2012-11-20 09:04:24 +01:00
Laurent Destailleur
6cdb720e9c
Fix: Missing info_admin
2012-11-20 00:13:31 +01:00
Laurent Destailleur
72608e7a72
Fix: Checkstyle
2012-11-19 23:43:14 +01:00
Laurent Destailleur
d8d1db143f
Typo
2012-11-19 23:26:07 +01:00
Laurent Destailleur
bd90d7979d
Qual: Removed duplicate code
...
Qual: Removed deprecated warning
2012-11-19 17:42:37 +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
Maxime Kohlhaas
eec5ddc08d
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
2012-11-19 13:31:15 +01:00
Regis Houssin
1a4c582b05
Merge pull request #489 from jfefe/webservices
...
New webservice for order with method to get, create and valid an order
2012-11-19 03:16:51 -08:00
jfefe
7157869371
New webservice for order with method to get, create and valid an order
2012-11-19 12:14:51 +01:00
Regis Houssin
f933e03285
Merge pull request #488 from jfefe/webservices
...
Add information about price when call a product by webservice
2012-11-19 01:33:50 -08:00
jfefe
d9d01c80b0
Add information about price when call a product by webservice
2012-11-19 00:35:01 +01:00
Laurent Destailleur
95afbdbd5e
Merge pull request #485 from grandoc/develop
...
fix some text
2012-11-18 09:55:39 -08:00
Laurent Destailleur
b9868bf0ce
Fix: units
2012-11-18 18:44:51 +01:00
Laurent Destailleur
c2d4b4d2e9
Fix: Edit of emailing setup was not possible
2012-11-18 18:36:50 +01:00
Grand Philippe
1b74df932b
fix some translations
2012-11-18 17:39:49 +01:00
Grand Philippe
86ed4ba08c
fix some translations
2012-11-18 17:29:31 +01:00
Laurent Destailleur
f58d0636a1
Doxygen
2012-11-18 16:55:00 +01:00
Laurent Destailleur
eb7dc8934c
Fix: Do not loose label
2012-11-18 16:41:10 +01:00
Laurent Destailleur
46976bd009
Fix: Some fix in volume calculation
2012-11-18 16:21:38 +01:00
Laurent Destailleur
7386dc3aef
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2012-11-18 15:24:15 +01:00
Laurent Destailleur
6512fd90a9
New: Can export customer shipments.
2012-11-18 15:24:01 +01:00
Laurent Destailleur
e490aeef43
Merge pull request #487 from jfefe/webservices
...
Webservices
2012-11-18 06:15:21 -08:00
jfefe
324b11ebb9
Add comment
2012-11-18 13:20:27 +01:00
jfefe
f47ce7b220
New webservice to fetch categories
2012-11-18 13:15:19 +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
f1f080b86a
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2012-11-18 11:52:19 +01:00
Laurent Destailleur
3fa7afae10
Fix: jquery upgrade has broken background compatibility with plugins.
...
Upgrade jquery core only if required.
2012-11-18 11:52:04 +01:00
Regis Houssin
dc775c4418
Merge pull request #486 from jfefe/webservices
...
Webservices
2012-11-17 23:35:33 -08:00
jfefe
0f789f6ad3
New webservice method to get list of product for a specific category
2012-11-17 23:40:58 +01:00
jfefe
40a3704739
New webservice method to get list of usergroups
2012-11-17 23:21:12 +01:00
Laurent Destailleur
fe86b5d29e
Fix: 2 other fixes on option MAIN_JS_ON_PAYMENT
2012-11-17 20:25:44 +01:00
Laurent Destailleur
5b02ff3a86
Fix: 3 fixes on option MAIN_JS_ON_PAYMENT (css, bad path, removed
...
forced var)
2012-11-17 19:55:19 +01:00
Grand Philippe
e5ae46bd11
fix some text
2012-11-17 15:53:04 +01:00
Laurent Destailleur
8c27a3202b
Qual: Removed useless files. Speed gain was not significant, has problem
...
with https and need a lot of work to maintain each time we update an
external lib.
2012-11-17 11:56:30 +01: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
Maxime Kohlhaas
fc4c5f333f
Fix : fatal error while importing, function name wasn't complete
2012-11-17 10:19:26 +01:00
Maxime Kohlhaas
da4383777d
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
2012-11-17 10:12:33 +01:00
Laurent Destailleur
255bd565fb
Removed warning
2012-11-17 00:58:43 +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
5f9cf28e45
New: Add option to choose if init of form is for a company third party
...
or an individual third party.
2012-11-15 16:26:05 +01:00
Laurent Destailleur
7c78e1c0f6
Doxygen and normalize code.
...
New: add more PHPUnit
2012-11-15 14:52:19 +01:00
Maxime Kohlhaas
9911c64f0b
Fix : $now not defined and proposal date used instead of end validity to display warning
2012-11-14 22:32:20 +01:00
Maxime Kohlhaas
d687d37573
Fix : $now defined twice
2012-11-14 22:31:54 +01:00
Laurent Destailleur
28b4a03432
Fix: Correct vat
2012-11-14 20:49:19 +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
ce10c87e09
Fix: No message to show result
...
Fix: Must not overwrite property of object
2012-11-14 18:58:55 +01:00
Laurent Destailleur
4c4eeaac2a
Fix: Test fails if value is 0
2012-11-14 18:56:47 +01:00
Laurent Destailleur
768e719961
Fix: firstname was missing
2012-11-14 18:32:52 +01:00
simnandez
096699cf18
Trad: Add missing ca_ES and es_ES translations
2012-11-14 15:17:26 +01:00
jfefe
23e47b7156
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into webservices
2012-11-14 12:42:16 +01:00
jfefe
8f15dd4df2
Fix : correct invoice line description when calling by webservice
2012-11-14 12:42:04 +01:00
Regis Houssin
8908f977b8
Fix: converting line delimiters !!!
2012-11-14 11:31:08 +01:00
Regis Houssin
474b68b3e4
Fix: strict mode mother
2012-11-14 11:29:22 +01:00
Maxime Kohlhaas
667c8cffae
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko559
2012-11-14 11:02:35 +01:00
Laurent Destailleur
5e583b65f2
Doxygen
2012-11-14 01:35:39 +01:00
Laurent Destailleur
df42dda452
Doxygen
2012-11-14 01:20:36 +01:00
Laurent Destailleur
3dd9d20d53
Add alternative picto for rendez-vous.
2012-11-14 00:59:52 +01:00
Laurent Destailleur
06c77576b7
New: Maxi debug on feature to filter lines on export. Removed a lot of
...
bugs but I had to change a lot of thing to fix this. There is still
work to now save filters in session.
2012-11-14 00:27:25 +01:00
Laurent Destailleur
81f9b54618
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2012-11-14 00:23:47 +01:00
Laurent Destailleur
1fa9048ca5
Update nl_BE
2012-11-14 00:23:31 +01:00
Regis Houssin
7be2057b00
Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop
2012-11-13 22:44:33 +01:00
Regis Houssin
8e141fce14
Fix: strict mode father
2012-11-13 22:43:54 +01:00
Laurent Destailleur
3c7ad3d58c
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2012-11-13 17:27:16 +01:00
Laurent Destailleur
22d1847250
Fix: Option MAIN_MAIL_SENDMAIL_FORCE_BA and MAIN_FIX_BUGGED_MTA was not
...
complete.
2012-11-13 17:25:47 +01:00
Regis Houssin
d9efa95e09
Fix: optimize code
2012-11-13 16:20:15 +01:00
Regis Houssin
84b50f45f8
Fix: strict mode again
2012-11-13 14:44:32 +01:00
Regis Houssin
88658eaf50
Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop
2012-11-13 12:32:38 +01:00
Regis Houssin
a0c478a0a2
Fix: strict mode cleaner
2012-11-13 12:32:05 +01:00
Laurent Destailleur
cc648e7eb2
Fix: typo error
2012-11-13 11:09:49 +01:00
Regis Houssin
4ec1d376bf
Fix: strict mode journey
2012-11-13 09:02:21 +01:00
Regis Houssin
5faa7fb075
Fix: for module name with number
2012-11-12 19:09:53 +01:00
Regis Houssin
b95ab2239f
Fix: remove unused code
2012-11-12 09:43:12 +01:00
Laurent Destailleur
124366f41a
Fix: To be compatible with LDAP synchro, property oldcopy must be set.
...
We add a warning if not.
2012-11-11 23:31:45 +01:00
Laurent Destailleur
ca7baad663
Translation
2012-11-11 19:45:51 +01:00
Laurent Destailleur
e7164cb243
Fix: Some checkstyle errors
2012-11-11 18:18:57 +01:00
Laurent Destailleur
66755fb166
Fix: Avoid confusion between method getXXX into parent class with
...
method getXXX into child class. They are not inheritance, so i renamed
method of parent into getXXXForKey.
2012-11-11 18:11:10 +01:00
Laurent Destailleur
842982f134
Doxygen
2012-11-11 17:50:24 +01:00
Laurent Destailleur
f9dec36d7a
Fix: Regression
2012-11-11 15:44:02 +01:00
Regis Houssin
2240dd4ac6
Fix: missing tinyint
2012-11-11 15:12:42 +01:00
Laurent Destailleur
7d5c4a3b38
Fix: Fix upgrade
...
New: Update dump file
Qual: Add label for PHPUnit tests
2012-11-11 14:34:55 +01:00
Laurent Destailleur
d3ebeccff4
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2012-11-10 16:24:51 +01:00
Laurent Destailleur
f43b26f311
Fix: Bad link
2012-11-10 16:24:20 +01:00
Regis Houssin
f6c56379dc
Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop
2012-11-10 16:09:06 +01:00
Regis Houssin
54d4661769
Fix: missing action type for hookmanager
2012-11-10 16:08:26 +01:00
Laurent Destailleur
318ec50134
Merge pull request #479 from atm-maxime/develop
...
Fix : proposal warning was based on proposal date
2012-11-10 05:56:08 -08:00
Regis Houssin
2ecb9262e7
Fix: wrong access rights and remove unused code
2012-11-10 08:19:33 +01:00
Regis Houssin
57cce6f517
Fix: missing global
2012-11-09 19:34:05 +01:00
Regis Houssin
cbb6ddbe83
Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop
2012-11-09 19:24:33 +01:00
Regis Houssin
0e0582c16f
Fix: avoid conflicts with external module if triggers used
2012-11-09 19:23:46 +01:00
Maxime Kohlhaas
8824be0260
Fix : proposal warning was based on proposal date instead of proposal end validity on commercial home page
2012-11-09 16:04:30 +01:00
Maxime Kohlhaas
332c077d77
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko559
2012-11-09 13:46:50 +01:00
Laurent Destailleur
661d37eacf
Fix: New vat for switzerland
2012-11-08 12:15:15 +01:00
Regis Houssin
afe339a2e2
Fix: strict mode
2012-11-07 12:00:17 +01:00
Regis Houssin
40725e72a5
Fix: missing spanish localtax values update
2012-11-07 11:49:28 +01:00
Laurent Destailleur
579544aa2f
Add example of comment
2012-11-07 02:22:25 +01:00
Maxime Kohlhaas
7035ec42f1
Task # 559 : Modifications to store unitprice as in supplier prices
2012-11-07 00:38:53 +01:00
Laurent Destailleur
831fe6a29e
Fix: More fix about the new localtax system
2012-11-06 23:45:16 +01:00
Maxime Kohlhaas
5586897f70
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko559
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/install/mysql/migration/3.2.0-3.3.0.sql
2012-11-06 23:07:40 +01:00
Laurent Destailleur
7d01ea7fc3
Fix: Do not break dolibarr usage if log fails
2012-11-06 19:42:03 +01:00
Laurent Destailleur
fff8598282
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2012-11-06 19:30:38 +01:00
Laurent Destailleur
f37c559235
Fix: regression
2012-11-06 19:23:23 +01:00
Laurent Destailleur
9c8d653780
Merge pull request #477 from FHenry/develop
...
Fix bug on mass mailling unsubsscribe fonctionnality
2012-11-06 09:52:32 -08:00
Regis Houssin
869c6e1fda
Merge pull request #478 from jfefe/webservices
...
Minor improvement of webservice for product
2012-11-06 08:44:03 -08:00
jfefe
8a69a258fd
image information in webservice product : fix wrong objet
2012-11-06 16:18:26 +01:00
fhenry
e12999bcfd
Correct fix
2012-11-06 15:39:47 +01:00
fhenry
9a3c7a230b
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2012-11-06 15:36:44 +01:00
Laurent Destailleur
348674c438
Merge pull request #476 from simnandez/develop
...
Fix: if no results do not charge data
2012-11-06 06:26:50 -08:00
jfefe
8175a9a7e5
Add image information in webservice product
2012-11-06 15:16:49 +01:00
Regis Houssin
7de5a7fd3f
Fix: compatibility with multicompany
2012-11-06 14:56:49 +01:00
fhenry
3651b8895e
Fix bug on mass mailling unsubsscribe fonctionnality
2012-11-06 14:21:17 +01:00
simnandez
353c932e11
Fix: if no results do not charge data
2012-11-06 12:33:35 +01:00
jfefe
9eac0d06ec
Add price_ttc value in product properties when call by webservice
2012-11-06 01:41:31 +01:00
Regis Houssin
8954422435
Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop
2012-11-05 17:27:01 +01:00
Regis Houssin
72598bf4d4
Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop
2012-11-05 17:25:57 +01:00
jfefe
8361cc29a1
Can have the thirdparty status 'active' when creating by webservices
2012-11-05 17:25:30 +01:00
Laurent Destailleur
ba56e679bd
Fix: Calculation of default date for payment term was not using
...
function.
2012-11-05 17:21:05 +01:00
Laurent Destailleur
4cd1bbb0ca
Fix: bad data init
2012-11-05 17:01:05 +01:00
Laurent Destailleur
027ad065a5
Removed TODO
2012-11-05 12:04:13 +01:00
jfefe
00ee6e9960
Can have the thirdparty status 'active' when creating by webservices
2012-11-05 03:49:17 +01:00
Laurent Destailleur
5d57677814
Fix: example
2012-11-04 21:20:27 +01:00
Laurent Destailleur
8896803921
New: We can use a dynamic value ($conf->global->XXX for example) into
...
titles of menus.
New: Can choose menu entry to show with external site module.
2012-11-04 21:19:12 +01:00
Laurent Destailleur
542b6f0731
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2012-11-04 19:32:30 +01:00
Laurent Destailleur
bebead8e54
Fix: To fix database integrity problems (I didn't find how
...
orphelins appears, but they appears on some plateform).
2012-11-04 19:32:14 +01:00
fhenry
1f41547dc2
Set unique key index unique in db (Conform to SQL standard) and needed
...
for migration to other SGBD with key.sql file
2012-11-04 15:55:12 +01:00
fhenry
be79c06c72
Set unique key index unique in db (Conform to SQL standard) and
...
needed for migration to other SGBD
2012-11-04 15:21:08 +01:00
Laurent Destailleur
80c252dd62
Fix: Use same labels to go back to draft than other elements.
...
Re-open is for "closed" to a validated status.
Modify is for a validated status to draft.
2012-11-03 21:33:55 +01:00
Laurent Destailleur
454b8b7279
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2012-11-03 21:14:38 +01:00
Laurent Destailleur
7e1a74cef1
Fix: If shipment is closed before delivery element is generated, there
...
was no way to generate it again (dead lock situation).
2012-11-03 21:14:23 +01:00
Regis Houssin
1722db223a
Fix: add timepicker default options
2012-11-03 20:41:59 +01:00
Regis Houssin
77e45f70a4
Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop
2012-11-03 19:16:02 +01:00
Regis Houssin
d0dc336a85
New: jQuery and jQuery UI upgrade
...
New: jQuery Timepicker addon for Datepicker
2012-11-03 19:15:45 +01:00
Laurent Destailleur
4c60740623
Do not loose input when there is a validation error.
2012-11-03 17:34:57 +01:00
Laurent Destailleur
e25fe89887
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2012-11-03 17:00:20 +01:00
Regis Houssin
076fa17593
Fix: missing colspan value
2012-11-03 16:58:50 +01:00
Laurent Destailleur
aae39ecb2e
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2012-11-03 16:58:23 +01:00
Laurent Destailleur
0f2dac163f
Fix: Bad label when validating/paying an invoice from POS module
2012-11-03 16:58:07 +01:00
Regis Houssin
a26ab0e8e1
Fix: add just colspan value
2012-11-03 16:51:41 +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
135a622076
Fix: Bad parameter
2012-11-03 15:35:11 +01:00
Laurent Destailleur
af0c1a5f76
Fix: Missing parameter
2012-11-03 15:33:49 +01:00
Laurent Destailleur
7f2c6dc6eb
Only code comments
2012-11-03 14:44:06 +01:00
Laurent Destailleur
19c617e4a0
Fix: Solve double ";;"
2012-11-03 13:49:31 +01:00
Laurent Destailleur
0c7af5c8a0
Fix: Not enought space for free text. To avoid to edit again and again
...
value for all templates, I added an option to be able to fix template
onto production when space is not enough.
2012-11-03 13:32:37 +01:00
Laurent Destailleur
f571adf62e
Fix: For supplier invoice, we must use properties of supplier to know if
...
seller use localtax RE and IRPF.
2012-11-03 12:19:47 +01:00
Laurent Destailleur
df7bedf955
Fix: [ bug #592 ] stock sold value is wrong
2012-11-03 12:12:24 +01:00
Laurent Destailleur
d3491e9ac0
Fix: Colors must be set into CSS.
2012-11-03 11:55:39 +01:00
Laurent Destailleur
7fd16c3a7e
Qual: Error management
2012-11-03 11:54:32 +01:00
Laurent Destailleur
dac97e2115
Fix: Do not try to show supplie ref if not defined.
2012-11-03 11:39:48 +01:00
Laurent Destailleur
118733c600
Fix: Error message type
2012-11-03 11:26:45 +01:00
Laurent Destailleur
375f464553
Fix: Option FACTURE_DEPOSITS_ARE_JUST_PAYMENTS was not used into
...
journals.
2012-11-03 04:29:38 +01:00
Laurent Destailleur
79e3b4d792
Fix: Missing br
2012-11-03 04:02:48 +01:00
Laurent Destailleur
4d098efa38
Fix: [ bug #580 ] problème saisie du code bic/swift des coordonénes
...
bancaires client
2012-11-03 03:34:49 +01:00
Laurent Destailleur
8709933288
Fix: Too much sanitizing
2012-11-03 00:47:09 +01:00
Laurent Destailleur
f8a9733b73
Again 2 pixels missings
2012-11-03 00:37:10 +01:00
Laurent Destailleur
ce12f6980d
Ypdate language files for zh_TW
2012-11-02 15:46:12 +01:00
Laurent Destailleur
5f3ceb0081
Fix: Label for payment by cheque using the wrong translation key
...
Fix: Option to overwrite translation did not work as expected
Fix: Bad translation for greece
2012-11-02 15:41:09 +01:00
Laurent Destailleur
f87865f039
Fix: crazy pagebreak when warterwark is higher than free space.
2012-11-02 14:21:32 +01:00
Wind Chen
b083c3b692
Added new language zh_TW
...
1.Added zh_TW directory into /htdoc/langs/
2.Added Language_zh_TW= Traditional Chinese into
/htdoc/langs/en_US/languages.lang
2012-11-01 23:08:24 +08:00
Regis Houssin
a108abddda
Fix: disabled ajax for the moment
2012-11-01 10:48:48 +01:00
Laurent Destailleur
0328f0de11
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2012-10-31 19:38:28 +01:00
Laurent Destailleur
9b1f70e58e
Fix: Trick to solve easily problem of font for some foreign users.
2012-10-31 19:38:16 +01:00
Regis Houssin
455d399bce
Fix: remove tag
2012-10-31 16:15:37 +01:00
Regis Houssin
bacc8991b3
Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop
2012-10-31 15:51:22 +01:00
Regis Houssin
634b5f7d1b
Fix: image is hard defined
2012-10-31 15:50:14 +01:00
Laurent Destailleur
fd7aea9779
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2012-10-31 15:21:38 +01:00
Laurent Destailleur
18e5f8dea6
Fix: Bad detection of space left
2012-10-31 15:21:21 +01:00
Laurent Destailleur
b619437377
Merge pull request #469 from camlafit/develop
...
Return Human readable date product
2012-10-31 07:13:46 -07:00
Laurent Destailleur
13ef8491b7
Fix: Error management
2012-10-31 15:09:42 +01:00
Laurent Destailleur
68bf51c8dd
Qual: Uniformize PDF code
2012-10-31 14:55:35 +01:00
cam.lafit
a3f0ce9063
Merge all substitutions on same loop (Invoicing with odt)
...
* It's not necessary to have a redondant loop to substitute all variables
2012-10-31 14:49:27 +01:00
cam.lafit
7b8b015569
Return Human readable date product
...
* By default date with mktime format, not great on Invoice
2012-10-31 14:49:27 +01:00
Laurent Destailleur
f6d9b2abe3
New: Add hidden option MAIN_PDF_MARGIN_LEFT, MAIN_PDF_MARGIN_RIGHT,
...
MAIN_PDF_MARGIN_TOP, MAIN_PDF_MARGIN_BOTTOM to force margins of
generated PDF.
Qual: Use 2 different var for reserver footer height and free text
height.
2012-10-31 13:48:59 +01:00
Laurent Destailleur
dbfe71922e
Fix: Avoid warnings
2012-10-31 12:35:52 +01:00
Regis Houssin
b70af837df
Fix: avoid warning
2012-10-31 09:59:24 +01:00
Regis Houssin
2607a8a3dd
Merge pull request #470 from atm-maxime/develop
...
Fix : internal contact not displayed in rouget PDF
2012-10-31 01:51:36 -07:00
Regis Houssin
0e0bbbeddc
Fix: morning strict mode
2012-10-31 09:50:20 +01:00
Maxime Kohlhaas
240d310a7f
Fix : shipment PDF rouget wasn't using the right var to access related internal contact
2012-10-31 08:57:56 +01:00
Maxime Kohlhaas
69111e423f
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko559
2012-10-31 08:40:13 +01:00
Laurent Destailleur
64d8d558a5
Qual: Uniformize pdf code
2012-10-31 02:29:45 +01:00
Laurent Destailleur
066bcbb469
Qual: Add dol_format_address PHPUnit tests
2012-10-31 01:45:48 +01:00
Laurent Destailleur
8ea48b28eb
New: More complete setup for bank ids according to countries
2012-10-31 00:46:46 +01:00
Laurent Destailleur
1d7820c5ac
New: English bank account need a bank code (called sort code) to
...
identify an account.
2012-10-31 00:22:13 +01:00
Laurent Destailleur
42d2a0a2d1
Fix: Bad position of columns. Works with all paper format now.
2012-10-30 19:24:31 +01:00
Laurent Destailleur
08724f5ec0
Qual: Some changes to use more efficiently bottom of page when there is
...
several pages (we don't keep space for total on all pages, but only last
one)
2012-10-30 18:26:04 +01:00
Laurent Destailleur
54852e29e7
Qual: Removed duplicate template (nearly no difference between sirroco
...
and typhon, so no need to keep them both).
2012-10-30 17:59:16 +01:00
Laurent Destailleur
ea90571925
Fix: The bottom margin is already included into heightforfooter
...
This provide 1cm more for product description.
2012-10-30 17:57:32 +01:00
Laurent Destailleur
6f9c9fcd55
Fix: Free text overlap data when not on last page.
2012-10-30 13:11:17 +01:00
Laurent Destailleur
df6c29ba0b
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2012-10-30 13:00:22 +01:00
Laurent Destailleur
9bee735c2d
Fix: Bad code for specimen
2012-10-30 12:02:13 +01:00
Laurent Destailleur
9d44590980
Fix: Using a more precise function to calculate free texts height avoid
...
having few pixels offset on free texts.
2012-10-30 11:17:49 +01:00
Laurent Destailleur
6bfe3e3905
Fix: Translation
2012-10-30 09:43:31 +01:00
Maxime Kohlhaas
fa46923b3e
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko559
2012-10-30 08:06:29 +01:00
Laurent Destailleur
1bbdfc3717
Fix: DTD used for HTML output pages is HTML, not XML.
2012-10-29 19:32:10 +01:00
Laurent Destailleur
e013fa01a7
Fix: Revert direction of option (this information is a legal issue for
...
most countries). Also, i removed the mandatory test, this is required
for invoices, not proposals.
So now, there is no need to hide by default because test on invoice
setup has been removed, so we can show by default (if defined) and use
option to force to hide if we want.
2012-10-29 11:38:32 +01:00
Regis Houssin
44f591e600
Fix: can't delete an export
2012-10-29 10:36:26 +01:00
Regis Houssin
705b0c0d52
Fix: better for show signature
2012-10-29 10:00:24 +01:00
Laurent Destailleur
9d4471dd67
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/core/modules/import/import_csv.modules.php
2012-10-28 19:53:14 +01:00
Laurent Destailleur
3738d3e6be
Fix: Better fix for import when field is computed by a function
2012-10-28 18:57:30 +01:00
Regis Houssin
b952a7f9bf
Fix: convert line delimiters (use the last eclipse version)
2012-10-28 13:57:21 +01:00
Regis Houssin
82cb0802d0
Fix: broken feature, missing $page
...
Fix: bad field name
2012-10-28 02:14:08 +02:00
Laurent Destailleur
a6bd506bd0
Fix: syntax error
2012-10-27 20:32:33 +02:00
Laurent Destailleur
ee29c65708
Move stock import into stock module (stock module is at a low level than
...
product)
2012-10-27 20:27:07 +02:00
Laurent Destailleur
6c0fb9a1f1
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2012-10-27 20:04:03 +02:00
Laurent Destailleur
a7e35a9308
Fix: If we exclude dirs, we must also clean array to avoid to count
...
them.
2012-10-27 20:02:09 +02:00
Maxime Kohlhaas
bed17951b1
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko559
2012-10-27 15:59:40 +02:00
Christophe Battarel
253e3412db
fix wrong insert sql construction
...
field type detection was made before optional conversions so it might be wrong; i replaced it with a more simple solution
2012-10-27 12:55:28 +02:00
Regis Houssin
6b07579620
Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop
2012-10-27 11:30:36 +02:00
Regis Houssin
2bbfad2460
Fix: missing parameter
2012-10-27 11:30:08 +02:00
Christophe Battarel
eb4cf359ec
fix error in constant name for SOCIETE_CODEFOURNISSEUR_ADDON in get_codefournisseur()
2012-10-27 11:12:41 +02:00
Laurent Destailleur
443f5ca03e
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2012-10-27 00:23:54 +02:00
Laurent Destailleur
7a48351909
Fix: delete file from ecm module
2012-10-27 00:23:16 +02:00
Laurent Destailleur
833ada4732
Merge pull request #465 from simnandez/develop
...
Fix: [ bug #579 ] Multi-Company and imports
2012-10-26 11:00:52 -07:00
simnandez
9ada60afbc
New: More import options. Products categories
2012-10-26 18:53:56 +02:00
simnandez
3821bf8c66
New: More import options. Products categories
2012-10-26 18:43:34 +02:00
simnandez
9a05bc8e83
New: More import options. Products categories
2012-10-26 18:38:34 +02:00
simnandez
d4df585e3c
New: More import options. Customer and suppliers categories
2012-10-26 18:34:49 +02:00
simnandez
425ebae802
New: More import options. Products categories
2012-10-26 18:19:04 +02:00
Laurent Destailleur
0d48682eed
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2012-10-26 17:59:39 +02:00
simnandez
7aec227694
New: More import options. Products stocks
2012-10-26 17:52:53 +02:00
simnandez
970933ec7f
Fix: [ bug #579 ] Multi-Company and imports
2012-10-26 17:29:41 +02:00
Regis Houssin
93c03756ab
Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop
2012-10-26 15:21:36 +02:00
Regis Houssin
c521a77e92
New: add key generator in webservices admin page
2012-10-26 15:20:47 +02:00
Regis Houssin
00dbf867ff
Merge pull request #464 from simnandez/develop
...
Trad: Add ca_ES and es_ES missing translations
2012-10-26 00:28:44 -07:00
simnandez
4a0336759e
Trad: Add ca_ES and es_ES missing translations
2012-10-26 09:21:08 +02:00
Regis Houssin
bc2280e4ab
Fix: avoid phpunit warning
2012-10-26 09:12:19 +02:00
Maxime Kohlhaas
fd5fb90649
Task # 559 : price defined on product page is unit price. Need to multiplicate this price by qty to have the right global price in the product list
2012-10-26 01:07:11 +02:00
Maxime Kohlhaas
fc7bc7e5d9
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko559
2012-10-26 01:00:22 +02:00
Maxime Kohlhaas
0f1617c31d
Task 559 : add use of price by qty in product selection (select and ajax search)
2012-10-26 01:00:03 +02:00
Laurent Destailleur
aee92ad3dc
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2012-10-26 00:59:11 +02:00
Laurent Destailleur
7eae998868
Fix: Bad default value
2012-10-26 00:57:51 +02:00
Regis Houssin
b5d70ad17f
Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop
2012-10-25 22:30:41 +02:00
Regis Houssin
48ce43d6f1
New: add export filters (thank you Charles Benke)
2012-10-25 22:30:17 +02:00
simnandez
e89a06bb9c
Fix: Bad ProfId assignation in imports
2012-10-25 17:08:25 +02:00
Laurent Destailleur
cbff238cbd
New: Support property "required" for extra fields.
2012-10-25 16:23:58 +02:00
Christophe Battarel
2272d13f5a
fix minor bug in invoice creation from another object
2012-10-25 15:50:43 +02:00
Christophe Battarel
135342b085
fix minor bugs in order creation from another object
2012-10-25 15:47:35 +02:00
Regis Houssin
4f1ef1bcf8
Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop
2012-10-25 15:01:26 +02:00
Regis Houssin
89b794dcd0
Fix: avoid errors with IE
2012-10-25 15:01:04 +02:00
Laurent Destailleur
a60516ae0d
Fix: Show warning only if transaction level not correct
2012-10-25 14:16:06 +02:00
Laurent Destailleur
7b92f66fab
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop
2012-10-25 13:17:35 +02:00
Laurent Destailleur
daeb1029a1
New: Support field required or not
2012-10-25 13:11:55 +02:00
Laurent Destailleur
d142dec69a
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2012-10-25 12:45:01 +02:00
Regis Houssin
53b9a95742
Merge pull request #461 from cbattarel/develop
...
fix wrong test for product type in order->getNbProductsLines()
2012-10-25 02:49:17 -07:00
Regis Houssin
9d95e8bffb
Fix: missing hookmanager
2012-10-25 11:44:04 +02:00
Christophe Battarel
144b08cac1
fix wrong test for product type in order->getNbProductsLines()
...
also add getNbServicesLines() function in order class.
2012-10-25 11:26:36 +02:00
Laurent Destailleur
2953ef37e6
Methods works with most tables/elements
2012-10-25 10:06:29 +02:00
Regis Houssin
f8f1d3a0df
Fix: borken feature, add PROPALE_PDF_PAIEMENT_ENABLED for view paiement
...
mode and paiement method in pdf
2012-10-25 09:24:05 +02:00
Regis Houssin
1cbd2a1b1c
Fix: broken feature
2012-10-25 08:45:35 +02:00
Maxime Kohlhaas
84df6bd639
Task # 559 : forgot to update supplier prices sql table
2012-10-25 08:19:16 +02:00
Maxime Kohlhaas
03cf96ed31
Task # 559 : add discount by qty as done in supplier prices
2012-10-25 08:18:59 +02:00
Maxime Kohlhaas
6ffa8532c5
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko559
2012-10-25 07:56:30 +02:00
Regis Houssin
23707e2346
Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop
2012-10-24 22:50:44 +02:00
Regis Houssin
65594d88a0
Fix: strict mode
2012-10-24 22:50:19 +02:00
Laurent Destailleur
773b082b13
Fix: Restore private: The public method to use by external code is
...
addExtraField.
2012-10-24 21:28:24 +02:00
Laurent Destailleur
1b116c05ef
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2012-10-24 21:21:58 +02:00
Laurent Destailleur
d1a4a6a090
New: Support synchro of field job/title.
...
New: Add script to synchronize users from ldap to dolibarr.
2012-10-24 21:19:10 +02:00
Laurent Destailleur
afb94c5014
Fix: Avoid warning
2012-10-24 21:16:58 +02:00
Regis Houssin
abb5047979
Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop
2012-10-24 18:41:51 +02:00
Regis Houssin
5c78b2d5dd
Fix: possibility to use this function in external module class
2012-10-24 18:41:22 +02:00
Laurent Destailleur
c88d8f5d0e
Fix: Resotre synchro ldap 2 dolibarr
2012-10-24 17:35:28 +02:00
Laurent Destailleur
f701c1afba
Fix translations
2012-10-24 17:33:47 +02:00
Laurent Destailleur
ec10bf4112
New: Add test for synchro ldap 2 dolibarr
2012-10-24 17:33:32 +02:00
Laurent Destailleur
0d92fe2de1
Normalize code
2012-10-24 17:32:10 +02:00
Laurent Destailleur
9c7b9f744f
Removed deprecated field
2012-10-24 17:31:02 +02:00
Laurent Destailleur
4fd79a4675
Qual: Removed deprecated field
2012-10-24 17:30:23 +02:00
Maxime Kohlhaas
fdc6ed90a4
Task # 559 : forgot to update product_price table to add column
2012-10-24 17:22:45 +02:00
Maxime Kohlhaas
21875a5e4a
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko559
2012-10-24 17:18:42 +02:00
Maxime Kohlhaas
2ff77bb2f1
Task # 559 : no need for a max quantity
2012-10-24 17:18:11 +02:00
Maxime Kohlhaas
35773d08ff
Task # 559 : mysql table creation + index and constraints
2012-10-24 17:16:03 +02:00
Laurent Destailleur
0b32b24eba
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2012-10-24 16:25:22 +02:00
Laurent Destailleur
2f4f427d9e
Fix: ldap errors
2012-10-24 16:25:09 +02:00
Regis Houssin
1c84dbaeec
Fix: missing zipcode in url
2012-10-24 12:27:43 +02:00
Regis Houssin
def1617f01
Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop
2012-10-24 12:19:05 +02:00
Regis Houssin
382f1a54c3
Fix: add key generator in agenda xcal admin page
2012-10-24 12:18:40 +02:00
fhenry
597ba3e6fc
[ task #581 ] Implement function DDLInfoTable for PostgreSQL db class
2012-10-24 11:37:00 +02:00
Regis Houssin
87d44c845d
Fix: restrict the search in the beginning
2012-10-24 11:18:15 +02:00
Regis Houssin
1055cf4e53
Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop
2012-10-24 10:19:46 +02:00
Regis Houssin
4f45ba8ff6
Fix: remove br
2012-10-24 09:56:31 +02:00
Laurent Destailleur
ed456347ce
Merge pull request #458 from cbattarel/develop
...
add charges and unitcharges in price update statement
2012-10-23 17:17:35 -07:00
Laurent Destailleur
1999452701
Fix: Avoid warnings
2012-10-23 23:49:16 +02:00
Christophe Battarel
41541e4bc2
add charges and unitcharges in update statement
2012-10-23 10:54:35 +02:00
Regis Houssin
30430953de
Fix: missing row and col parameters
2012-10-23 09:33:07 +02:00
Laurent Destailleur
a10518a2e3
Comment
2012-10-22 21:25:14 +02:00
Laurent Destailleur
9589b84a1a
Fix: No reason to start content of a cell with br
2012-10-22 19:30:49 +02:00
Maxime Kohlhaas
c4b12d7371
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko559
2012-10-22 17:47:41 +02:00
Maxime Kohlhaas
8ba55f49f1
Task # 559 : start of price by quantity management
2012-10-22 17:47:15 +02:00
Maxime Kohlhaas
94c12cfb2e
Task # 559 : start of price by quantity management
2012-10-22 17:24:14 +02:00
Regis Houssin
9bbea4f385
Fix: use span is better
2012-10-22 17:06:27 +02:00
Laurent Destailleur
eaad5f075e
Fix: Some fix to removed refused controls by distrib package build
...
systems.
2012-10-22 13:08:55 +02:00
Laurent Destailleur
58eb02274f
Fix: We must not use strtolower. Case sensitive search or not must be
...
managed by the LIKE or LIKE BINARY into request (this make code
portable on other database with the database driver and this avoid
errors of strtolower when using non latin characters).
2012-10-22 12:13:24 +02:00
Regis Houssin
2f15857dab
Fix: add mobile phone in contact list
...
TODO: Fax is obsolete and not used by several companies
2012-10-22 11:20:59 +02:00
Regis Houssin
a240343482
Fix: add possibility to filter with zipcode (very important)
2012-10-22 11:05:55 +02:00
Regis Houssin
f89e3238ee
New: try to use hooks for customizing lists
2012-10-22 10:49:16 +02:00
Regis Houssin
864f038370
Fix: missing "visible" field
2012-10-22 09:24:27 +02:00
Regis Houssin
6329344df2
Fix: broken features
...
Fix: use entity O for all entities
2012-10-22 09:15:08 +02:00
Laurent Destailleur
caa37422dd
Fix: curl must ignore ssl validation
2012-10-22 01:26:03 +02:00
Laurent Destailleur
99607073e3
Fix: Some fixes for the autosubscription to mailing-lists
2012-10-22 01:16:29 +02:00
Laurent Destailleur
71ac3d4359
Migrate to new syslog system.
2012-10-22 01:01:10 +02:00
Laurent Destailleur
d56791d4dc
Fix: Works with PHP 5.2
2012-10-22 00:43:59 +02:00
Laurent Destailleur
31779cdbd1
Fix: Bad date format
2012-10-22 00:28:32 +02:00
Laurent Destailleur
732b3ceace
Fix: Bad error management when validating member
2012-10-22 00:18:32 +02:00
Laurent Destailleur
bba5057d5d
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2012-10-21 15:51:03 +02:00
Laurent Destailleur
fbb3ce63a7
Fix: PDF works with US executive format.
2012-10-21 15:50:53 +02:00
Regis Houssin
97245d36aa
Fix: wrong method
2012-10-20 11:10:36 +02:00
Regis Houssin
033e9066fb
New: try to use hookmanager for customizing list
2012-10-20 10:08:18 +02:00
Regis Houssin
ac9dea1c19
Fix: security
2012-10-20 09:40:50 +02:00
Regis Houssin
99fa385602
Fix: minor vulnerabilities
2012-10-20 09:33:39 +02:00
Laurent Destailleur
cb95621d7e
Merge pull request #455 from simnandez/develop
...
New: More import options. Thirds Bank Accounts
2012-10-19 10:27:41 -07:00
Laurent Destailleur
5a3be48d09
New: Can edit bookmark from list
2012-10-19 17:28:18 +02:00
Laurent Destailleur
ffa1b10061
doxygen
2012-10-19 14:45:00 +02:00
Laurent Destailleur
40a1ba3b96
Fix: Removed deprecated translation
2012-10-19 14:23:21 +02:00
Laurent Destailleur
4a10874f54
New: add waring message when date is too low.
2012-10-19 13:01:29 +02:00
simnandez
aa53b7a2ba
New: More import options. Thirds Bank Accounts
2012-10-19 13:00:53 +02:00
Laurent Destailleur
70cf195fb4
Fix: removed test code
2012-10-19 09:34:31 +02:00
Laurent Destailleur
657d0197b6
Fix: json is a fuck... sh... 3 hours to find a bug ! (json fails
...
without any warning when converting non utf8 strings).
2012-10-18 16:30:12 +02:00
Laurent Destailleur
0152e226c1
Fix: Use correct translation of fields
2012-10-18 13:25:32 +02:00
Laurent Destailleur
82e0462dc8
Merge pull request #453 from simnandez/develop
...
New: More import options. Categories Trad: Add es_ES and ca_ES missing translations
2012-10-18 03:31:55 -07: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
4afdf2f2d2
Fix: [ bug #554 ] Firstname and lastname should not be mandatory for
...
corporate members.
2012-10-17 20:55:13 +02:00
Laurent Destailleur
97001951e6
New: Add field stock into product export
2012-10-17 20:32:57 +02:00
Laurent Destailleur
a41186b4c5
[ bug #70 ] Champ Stock toujours vide dans export produit
2012-10-17 20:30:17 +02:00
Laurent Destailleur
33540cb2e8
Repair not synchronized denormalized field.
2012-10-17 20:22:50 +02:00
Laurent Destailleur
319b512157
Fix: Avoid empty messages
2012-10-17 19:02:21 +02:00
simnandez
d7dcd3c14b
New: More import options. Supplier Products
2012-10-17 19:02:12 +02:00
Laurent Destailleur
c4ce66d784
Enhance error management
2012-10-17 18:47:18 +02:00
Laurent Destailleur
0cfd336c03
better message
2012-10-17 17:53:25 +02:00
Laurent Destailleur
ef1e735ff9
Fix: doxygen
2012-10-17 17:19:28 +02:00
Laurent Destailleur
4c5d696bb7
Translations
2012-10-17 16:13:06 +02:00
Laurent Destailleur
6803c68ebf
Fix: Bad date format
2012-10-17 15:53:45 +02:00
Laurent Destailleur
796b0fc12c
New: Enhance guide for new users to say how to start setup.
2012-10-17 15:19:43 +02:00
Laurent Destailleur
8ac375145d
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2012-10-17 15:07:33 +02:00
Laurent Destailleur
4d5a6c6f01
Typo error
2012-10-17 15:07:13 +02:00
Laurent Destailleur
773b2ead35
Merge pull request #454 from cbattarel/develop
...
correct bug in price delete
2012-10-17 06:01:26 -07:00
Laurent Destailleur
bbedddf992
Fix: Removed warning
2012-10-17 14:53:05 +02:00
Laurent Destailleur
01bd20147e
Fix: Some fixes and enhancement into modularizing log functions
2012-10-17 14:46:20 +02:00
Christophe Battarel
8f08d7a166
add entity in the unique key for delete
2012-10-17 14:25:43 +02:00
Laurent Destailleur
b160b97cbe
New: Add warning message.
2012-10-17 14:23:56 +02:00
Laurent Destailleur
5e510d4312
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2012-10-17 14:15:27 +02:00
Laurent Destailleur
c56e3b5c90
Fix: Migration error
2012-10-17 14:15:11 +02:00
Laurent Destailleur
4a913cfb38
Merge pull request #449 from marcosgdf/odt-discounts
...
Created function to retrieve total discounted amount of a commonobject
2012-10-17 05:03:55 -07:00
Laurent Destailleur
05ca191335
Merge pull request #451 from marcosgdf/syslog
...
Created a modular syslog handler system
2012-10-17 05:03:14 -07:00
Laurent Destailleur
0dffe08c07
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2012-10-17 13:12:02 +02:00
Christophe Battarel
e8b92cc2c5
correct bug in price delete
2012-10-17 12:47:40 +02:00
Laurent Destailleur
0a97ce71e5
Add gg flag
2012-10-17 12:40:10 +02:00
simnandez
23d3b6a783
New: More import options. Supplier Products
2012-10-17 12:36:30 +02:00
simnandez
6f430cc630
New: More import options. Supplier Products
2012-10-17 11:43:26 +02:00
simnandez
cf814dc7fd
New: More import options. Categories
...
Trad: Add es_ES and ca_ES missing translations
2012-10-17 10:42:16 +02:00
simnandez
2cf88e7847
New: More import options. Categories
...
Trad: Add es_ES and ca_ES missing translations
2012-10-17 10:40:17 +02:00
Laurent Destailleur
099bf034af
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2012-10-16 19:51:12 +02:00
Laurent Destailleur
4854c72348
Fix: [ bug #565 ] Display error bills have suppliers.
2012-10-16 19:15:36 +02:00
Laurent Destailleur
7bf5663096
Fix: [ bug #552 ] l'option "Adhérents non à jour" ne fonctionne pas
2012-10-16 18:33:49 +02:00
Regis Houssin
15aa2497ab
Fix: compatibility with multicompany sharings
2012-10-16 17:59:00 +02:00
Regis Houssin
26a5ac53d7
Fix: possibility to disable ajax
2012-10-16 16:10:23 +02:00
Marcos García
3c051abc22
Orders and proposals should also replace {object_total_discount}
2012-10-16 13:43:50 +02:00
Marcos García
ac4ee01723
mod_syslog_syslog class shouldn't be active if openlog is not available
2012-10-16 13:39:23 +02:00
Marcos García
df2262f8be
Stopped using (un)serialize functions but json functions
2012-10-16 12:18:05 +02:00
Marcos García
180eddff49
Because the rest of the class is using SYSLOG_CHROMEPHP_INCLUDEPATH it needs to be restored...
2012-10-16 02:25:48 +02:00
Marcos García
f250bb41e9
Removed unnecessary comments and commented unused config variables
2012-10-16 02:13:38 +02:00
Marcos García
07dcb07fd2
Created a modular syslog handler system
...
I've split all log handlers into classes so that people can make
new log handler systems without making changes to the core.
Also, now every log handler can handle how and what will be logged.
2012-10-16 02:01:37 +02:00
Marcos García
da94ec8fa4
Normalized thirdparties module card name
2012-10-16 01:36:42 +02:00
Laurent Destailleur
5dff8dbc6d
New: Avoid horizontal scroll on standard resolution.
2012-10-15 23:13:28 +02:00
Laurent Destailleur
e34cdb76e8
Fix: Translation
2012-10-15 23:02:52 +02:00
Laurent Destailleur
df3c1ca644
Fix: Showing rate
2012-10-15 22:13:39 +02:00
Laurent Destailleur
7a7e2b6873
Fix: Error management
2012-10-15 21:42:17 +02:00
Laurent Destailleur
0dbc7ebb25
Fix: error management
2012-10-15 21:31:46 +02:00
Laurent Destailleur
354e673d92
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2012-10-15 20:54:11 +02:00
Laurent Destailleur
6f93e9cdac
Fix: Can delete even if data corrupted (fk_bank set but entry removed
...
manually into llx_bank).
2012-10-15 20:53:49 +02:00
Marcos García
c9944a6b9b
Created function to retrieve total discounted amount of a commonobject
...
Also added an ODT tag to let people add it to their invoices, etc..
2012-10-15 00:49:39 +02:00
Marcos García
59e8964bc5
Fixed PHP warning on MailmanSPIP module
...
Also simplified the code and removed unused variables from it
2012-10-14 23:56:28 +02:00
Laurent Destailleur
70ae16f89e
Merge pull request #447 from simnandez/develop
...
New: More import options. Warehouses
2012-10-14 14:43:35 -07:00
Laurent Destailleur
118ec8277b
Fix: Old data store
2012-10-14 13:27:18 +02:00
Laurent Destailleur
325d47c882
Fix: Creation of notes was not using DolEditor class.
2012-10-14 13:18:52 +02:00
simnandez
6f799f8e16
New: More import options. Warehouses
2012-10-13 18:02:43 +02:00
Laurent Destailleur
153997432f
Fix: Several fix.
...
New: Also allow to enter a payment with a negative value on an invoice
and positive onto other.
2012-10-13 17:00:38 +02:00
Laurent Destailleur
8ff506b120
Sec: Sanitize all params page, sortfield and sortorder
2012-10-13 14:47:46 +02:00
Laurent Destailleur
ac38954c17
Fix: Regression selectlang choice
...
Fix: Regression conf file was not saved successfully.
2012-10-13 13:56:37 +02:00
Laurent Destailleur
2a8095f3de
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2012-10-13 13:03:57 +02:00
Laurent Destailleur
7385ea15db
Doxygen
2012-10-13 13:03:39 +02:00
Regis Houssin
df1e4a401a
Fix: convert line delimiters
...
Info: the last Eclipse version fix this problem
2012-10-13 11:42:58 +02:00
Regis Houssin
a12d453d38
Fix: security
2012-10-13 11:41:17 +02:00
Regis Houssin
67f40fcd1e
Fix: works on security
2012-10-13 10:39:16 +02:00
Laurent Destailleur
091966902e
Fix: for special_code=3
2012-10-12 22:18:31 +02:00
Laurent Destailleur
6046feda11
Restore border into PDF
2012-10-11 09:42:47 +02:00
Laurent Destailleur
6a7a982688
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2012-10-10 15:07:41 +02:00
Laurent Destailleur
4aebaf22ae
Fix: Avoid wrap on amount
2012-10-10 15:06:02 +02:00
Regis Houssin
10bd942328
Fix: customer ref is very important for a best traceability
2012-10-10 12:04:08 +02:00
Regis Houssin
62f170d3d7
Fix: add escape
2012-10-09 20:23:02 +02:00
Regis Houssin
edb6195cc2
Fix: add similitude test
2012-10-09 20:08:54 +02:00
Regis Houssin
925af263fc
Fix: best test
2012-10-09 18:54:21 +02:00
Regis Houssin
3abb1b88ff
Fix: best method
2012-10-09 18:33:02 +02:00
Regis Houssin
6791d23032
Fix: use asterisk for define the percentage
2012-10-09 18:21:12 +02:00
Regis Houssin
a20f7094ef
Fix: refactore
2012-10-09 18:11:51 +02:00
Regis Houssin
74dd4ce218
Fix: possibility to force the clause
2012-10-09 18:06:59 +02:00
Regis Houssin
337cb0faa5
Fix: add not exact method
2012-10-09 17:47:58 +02:00
Regis Houssin
9f43d8613c
Fix: missing clean parameters
2012-10-09 16:59:19 +02:00
Regis Houssin
8486f9d85d
Fix: missing spaces
2012-10-09 16:33:28 +02:00
Regis Houssin
7cde9ab668
New: add search method with case sensibility and filters
2012-10-09 15:49:42 +02:00
Laurent Destailleur
8b4886073c
Fix: Removed the FIXME. This is supported by the pgsql driver.
2012-10-09 12:03:39 +02:00
Laurent Destailleur
4413613d14
Another better fix.
2012-10-09 11:56:39 +02:00
Laurent Destailleur
1725561c34
Better security fix: Using GETPOST does not fix all cases, also the real
...
bug (missing escaping information when using it) was not fixed.
2012-10-09 11:42:38 +02:00
Regis Houssin
72a1194d14
Fix: search with case sensitive method
...
FIXME: Mysql "LIKE" is case insensitive by default and use LIKE BINARY
for case sensitive, Pgsql "LIKE" is case sensitive by default, and use
ILIKE for case insensitive
2012-10-09 10:57:15 +02:00
Regis Houssin
a814ea7924
Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop
2012-10-09 09:34:57 +02:00
Regis Houssin
4cd702bb1a
Fix: prevent XSS and SQL injection
2012-10-09 09:34:12 +02:00
Regis Houssin
044ec61aba
Merge pull request #446 from atm-maxime/develop
...
Task # 186 : Forgot to add the new box in the mod definition...
2012-10-08 23:50:49 -07:00
Regis Houssin
bfee8553f0
Merge pull request #445 from atm-maxime/mko543
...
Bug # 543 and # 570 : contact address is now used in recipient block and...
2012-10-08 23:50:29 -07:00
Regis Houssin
d61a8ee947
Fix: missing comma
2012-10-09 08:47:11 +02:00
Regis Houssin
089603e1c5
Fix: add import_key field
2012-10-09 08:40:32 +02:00
Maxime Kohlhaas
67dbae4486
Correction for new box inclusion
2012-10-09 00:58:07 +02:00
Maxime Kohlhaas
229005b1a9
Task # 186 : Forgot to add the new box in the mod definition...
2012-10-09 00:54:02 +02:00
Maxime Kohlhaas
d343b76f91
Bug # 543 and # 570 : contact address is now used in recipient block and no more display bug on customer order ref until 36 digits
2012-10-09 00:28:52 +02:00
Regis Houssin
478449da37
Fix: convert line delimiters
2012-10-08 20:47:10 +02:00
Regis Houssin
93d760e0fc
Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop
2012-10-08 20:44:28 +02:00
Regis Houssin
7f7676d357
Fix: uniformize variable name
2012-10-08 20:44:12 +02:00
Laurent Destailleur
d51db70768
Missing translation
2012-10-08 20:25:03 +02:00
Laurent Destailleur
26f4b344cb
Merge pull request #444 from cbattarel/develop
...
fix wrong update in previous commit
2012-10-08 10:55:33 -07:00
Regis Houssin
c35a1ebaf7
Fix: missing drop foreign key
2012-10-08 19:38:09 +02:00
Regis Houssin
0975918cc6
Fix: [task #146 ] Remove table llx_categorie_association
...
Conflicts:
htdocs/install/mysql/migration/3.2.0-3.3.0.sql
2012-10-08 19:27:02 +02:00
Christophe Battarel
99b323e8d0
fix wrong update in previous commit
...
(it was always remaining on step 5 !)
2012-10-08 16:25:50 +02:00
Regis Houssin
67c41721f5
Merge pull request #443 from marcosgdf/translations
...
Minor changes to es_ES translations
2012-10-08 03:01:57 -07:00
Regis Houssin
88785a8fef
Merge pull request #442 from cbattarel/develop
...
fix wrong last update in cleansep function
2012-10-08 03:01:34 -07:00
Marcos García
fed3c20548
Minor changes to es_ES translations
2012-10-08 11:44:55 +02:00
Christophe Battarel
04be578863
fix wrong last update in cleansep function
2012-10-08 11:32:28 +02:00
Marcos García
734b292440
Merge branch 'develop' into bug-569
...
Conflicts:
htdocs/install/inc.php
2012-10-08 11:16:33 +02:00
Marcos García
8ed706e4ac
Fixed bug #569 - Notices & Warnings when installing Dolibarr
...
Also translated a string & variable and improved html use
2012-10-08 02:45:58 +02:00
Laurent Destailleur
68ecc5eb89
Upgrade doliwamp
2012-10-08 02:38:30 +02:00
Laurent Destailleur
f9ceb78f58
Beautify instal pg.
...
Fix: Debian package
2012-10-07 20:04:07 +02:00
Laurent Destailleur
566855d7e8
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
ChangeLog
2012-10-06 23:15:10 +02:00
Laurent Destailleur
215d7a883e
Fix: Revert bugged new feature that show false information.
2012-10-06 23:13:46 +02:00
Laurent Destailleur
430b63f4e1
Fix: Bad message
2012-10-06 22:54:23 +02:00
Laurent Destailleur
4789b5e2d1
Fix: Usage of specific mysql function is forbidden
2012-10-06 22:46:54 +02:00
Laurent Destailleur
053b4dd63c
New: [ task #210 ] Can choose cash account during POS login
2012-10-06 21:47:59 +02:00
Laurent Destailleur
b2ec0a7669
Merge pull request #438 from simnandez/develop
...
Trad: Add ca_ES and es_ES translations
2012-10-06 11:16:23 -07:00
Laurent Destailleur
a659e6f9f7
More elegant position of button to aufofill fields.
2012-10-06 19:25:25 +02:00
simnandez
7faa90e831
New: More import options. Prepare database
2012-10-06 09:52:33 +02:00
simnandez
2d4957d415
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop
2012-10-06 09:38:09 +02:00
Laurent Destailleur
6873e93b7f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2012-10-05 19:40:09 +02:00
Laurent Destailleur
34f2402cb5
Qual: Removed dead code
2012-10-05 19:39:53 +02:00
simnandez
0e5cc34b1f
Trad: Add ca_ES and es_ES translations
2012-10-05 18:50:30 +02:00
Regis Houssin
b1ad840055
Fix: optimize code
2012-10-05 15:12:17 +02:00
Regis Houssin
6b21ca442d
New: add possibility to defined position/job of a user
...
Conflicts:
htdocs/install/mysql/migration/3.2.0-3.3.0.sql
2012-10-05 12:40:19 +02:00
Maxime Kohlhaas
85c03faec7
Merge branch 'mko186' into develop
...
Conflicts:
htdocs/langs/en_US/orders.lang
htdocs/langs/fr_FR/orders.lang
2012-10-05 08:30:09 +02:00
Regis Houssin
1b7f93fc29
Merge pull request #436 from simnandez/develop
...
Task # 104: Check if module invoice is active and user has creation permissions. Move creation invoice to action bar into customer card
2012-10-04 10:06:22 -07:00
Regis Houssin
6b50219999
Fix: add function for build $mysoc object
2012-10-04 18:54:56 +02:00
simnandez
f873198442
Fix: Warning into perms page
2012-10-04 18:40:05 +02:00
simnandez
caef97dc08
Task # 104: Check if module invoice is active and user has creation
...
permissions. Move creation invoice to action bar into customer card
2012-10-04 18:23:21 +02:00
Maxime Kohlhaas
16f82216bf
Task # 186 : Add stock column in sql request to get object lines + display alert icon if stock is too low
2012-10-04 16:26:33 +02:00
Maxime Kohlhaas
5a64e3b1ec
Task # 104 : Commited these 2 files instead of translations files
2012-10-04 15:43:52 +02:00
Laurent Destailleur
5c6b0c064e
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2012-10-04 15:43:28 +02:00
Laurent Destailleur
9ba100a84b
New: Support removing tab into member module
2012-10-04 15:37:10 +02:00
Maxime Kohlhaas
0e17c7c063
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko186
2012-10-04 15:36:47 +02:00
Maxime Kohlhaas
87d643d482
Task # 104 : translations
2012-10-04 15:36:38 +02:00
Maxime Kohlhaas
12128a6226
Task # 186 : Stock calculation on product, migration + update product
2012-10-04 15:25:34 +02:00
Laurent Destailleur
bdb7becbc6
Fix: Try another fix on getTrad bug.
2012-10-04 09:44:04 +02:00
Laurent Destailleur
4b27a9215b
Fix: Show message only when needed
2012-10-03 23:15:57 +02:00
Laurent Destailleur
59a33db53d
Fix: Add warning to ask refresh.
2012-10-03 20:10:29 +02:00
Laurent Destailleur
1f2b05fbc0
Fix: Can unset ChromePHP output
2012-10-03 18:40:24 +02:00
Laurent Destailleur
fa016baa7e
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2012-10-03 17:48:09 +02:00
Laurent Destailleur
2159848490
Fix: getTradFromKey
2012-10-03 17:47:53 +02:00
Laurent Destailleur
315670273d
Merge pull request #434 from grandoc/develop
...
try to fix canvas issue
2012-10-03 06:16:35 -07:00
Laurent Destailleur
a821d6cafe
Fix: We use dolibarr_details as type of DolEditor here, because we
...
must not accept images as description is included into PDF and not
accepted by TCPDF.
2012-10-03 14:52:01 +02:00
Laurent Destailleur
1d9e77a53d
Fix: We use dolibarr_details as type of DolEditor here, because we must
...
not accept images as description is included into PDF and not accepted
by TCPDF.
2012-10-03 14:49:51 +02:00
Laurent Destailleur
0f78ffda5c
New: POS module can works with only one payment method (cach, chq,
...
credit card).
2012-10-03 14:45:58 +02:00
Grand Philippe
fb487ff855
try to fix canvas issue
2012-10-03 14:20:04 +02:00
Laurent Destailleur
61958f445d
Fix translation
2012-10-03 14:15:07 +02:00
Laurent Destailleur
3bd20ee8ba
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2012-10-03 13:04:29 +02:00
Laurent Destailleur
6d8ea8dcd5
Update trans
2012-10-03 13:04:18 +02:00
Regis Houssin
4ed05b5b2e
Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop
2012-10-03 12:41:02 +02:00
Regis Houssin
935bb09b99
Fix: better translation
2012-10-03 12:39:48 +02:00
Laurent Destailleur
9997d6ca15
Fix: Other minor fixes
2012-10-03 11:53:14 +02:00
Laurent Destailleur
9dac672ca6
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2012-10-03 11:43:51 +02:00
Laurent Destailleur
2617fc21a6
Some fix: List of invoices to show in "to bill" menu must contains
...
"Validated, Shipment in process, Delivered" (some users may want to
make invoice before shipment, some after).
We keep workflow opened by default. Module workflow may restrict this
however.
Also, remove menu entry, because we now have direct link to page onto
list.
2012-10-03 11:43:39 +02:00
Regis Houssin
18015986b6
Fix: bad field name
2012-10-03 11:38:18 +02:00
simnandez
921795e562
Task # 104 : Remove MAIN_FEATURES_LEVEL
2012-10-03 09:16:27 +02:00
Regis Houssin
fc1cc95d08
Fix: bad path
2012-10-03 08:54:21 +02:00
Laurent Destailleur
44ee8b8e38
Doxygen
2012-10-03 00:39:34 +02:00
Laurent Destailleur
c25e908b75
Doxygen
2012-10-03 00:30:50 +02:00
Laurent Destailleur
4243f94f80
Merge pull request #424 from aspangaro/develop
...
Add function to choose chart of accounts
2012-10-02 14:10:50 -07:00
Laurent Destailleur
883e51566f
Merge pull request #432 from grandoc/develop
...
try to fix canvas within members module
2012-10-02 14:10:10 -07:00
Grand Philippe
ec9946222d
new try to fix canvas within members module
2012-10-02 22:58:49 +02:00
Laurent Destailleur
82eacec792
Merge pull request #431 from atm-maxime/mko104
...
Task # 104 : Can create an invoice from several orders
2012-10-02 11:38:35 -07:00
Laurent Destailleur
bef9fd152b
Fix: table creation scripts
2012-10-02 19:42:44 +02:00
Grand Philippe
085923dc64
try to fix canvas within members module
2012-10-02 18:27:41 +02:00
Maxime Kohlhaas
89e14043a1
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko186
2012-10-02 11:01:21 +02:00
Maxime Kohlhaas
3ca55eb058
Task # 104 : display invoice multi order link on third party page only if there are orders to bill + translations
2012-10-02 10:52:08 +02:00
Spangaro Alexandre
3ae6117e16
Reintegrate accounting.php in admin
2012-10-02 06:07:57 +02:00
Spangaro Alexandre
5c56bd629b
Fix: add country in request
2012-10-02 05:45:50 +02:00
Spangaro Alexandre
8a99eedc6c
Hum... Now it's work ! Little fix
2012-10-02 05:45:50 +02:00
Spangaro Alexandre
3e4fd761a5
Add function to choose chart of accounts
2012-10-02 05:45:49 +02:00
Laurent Destailleur
079ea61582
Fix: W3C
2012-10-02 00:36:23 +02:00
Laurent Destailleur
082ee53dae
Fix: Miscellaneous fix in supplier product input
2012-10-02 00:30:23 +02:00
Laurent Destailleur
eec2a7b34e
Merge pull request #429 from atm-maxime/mko559
...
Task # 559 : add discount on supplier prices
2012-10-01 13:31:17 -07:00
Laurent Destailleur
6971cf5779
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2012-10-01 22:05:22 +02:00
Laurent Destailleur
32fdfbb1cb
Fix: Styles
2012-10-01 21:53:22 +02:00
Laurent Destailleur
43dce1c3fa
Merge pull request #426 from grandoc/develop
...
add canvas to adherents module
2012-10-01 12:39:09 -07:00
Maxime Kohlhaas
1aa3156958
Task # 186 : new box of products with stock alert
2012-10-01 16:44:38 +02:00
Maxime Kohlhaas
af179eca94
Cosmetic : span buttons were'nt with the same style as links
2012-10-01 15:44:40 +02:00
Maxime Kohlhaas
8a62af1c78
Task # 559 : added use of discount in supplier bills
2012-10-01 11:49:20 +02:00
Maxime Kohlhaas
ed2a140046
Task # 559 : add display of discount in product list while adding line on supplier order
2012-10-01 11:45:28 +02:00
Maxime Kohlhaas
f62772a1c5
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
2012-10-01 11:26:42 +02:00
Maxime Kohlhaas
1d21f24fa7
Task # 559 : Add possibility to define a discount for min quantity on supplier product prices
2012-10-01 11:25:17 +02:00
Maxime Kohlhaas
6329c01d5d
Added link to multi-origin invoicing on thirdparty page
2012-10-01 11:23:51 +02:00
Regis Houssin
8c17266ed4
Merge pull request #425 from marcosgdf/translations
...
Added missing & improved es_ES translations
2012-10-01 01:11:30 -07:00
Regis Houssin
7837356fe9
Merge pull request #423 from simnandez/develop
...
Trad: Add missing translations
2012-10-01 01:11:14 -07:00
Grand Philippe
0215ce9122
add canvas to adherents module
2012-10-01 10:05:03 +02:00
Marcos García
a4b0f7e521
Fixed es_ES typo
2012-10-01 04:17:17 +02:00
Marcos García
13cbf154e1
Added missing & improved es_ES translations
2012-10-01 03:09:37 +02:00
Regis Houssin
bcf46d00f0
Fix: convert line delimiters !!
2012-09-30 21:26:58 +02:00
Regis Houssin
d23188c64a
Fix: doxygen
2012-09-30 20:49:13 +02:00
Regis Houssin
422f028ac9
Fix: use ADHERENT_BANK_USE for check or not bank via invoice
...
Fix: code optimizing
2012-09-29 12:07:07 +02:00
Laurent Destailleur
9db72fb50d
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2012-09-28 16:11:46 +02:00
Laurent Destailleur
e7203fa4f3
New: The discount on line for supplier invoices is now supported
2012-09-28 16:08:44 +02:00
simnandez
6bbcb376b1
Trad: Add missing translations
2012-09-28 15:55:50 +02:00
Maxime Kohlhaas
6ac83a4205
Task # 355 : last correction
2012-09-28 14:58:47 +02:00
Maxime Kohlhaas
4deae1d948
Task # 355 : corrections + added on edit mode
2012-09-28 14:56:47 +02:00
Maxime Kohlhaas
398023e722
Task # 335 : translation
2012-09-28 14:29:20 +02:00
Maxime Kohlhaas
c0f22ac472
Task # 355 : autofill contat address with third party address
2012-09-28 14:27:16 +02:00
Regis Houssin
3b4090852c
Merge pull request #420 from simnandez/develop
...
Trad: Add missing translation
2012-09-28 02:50:48 -07:00
Regis Houssin
0441c6dd46
Merge pull request #417 from aspangaro/develop
...
Continue working on accountancy
2012-09-28 02:43:54 -07:00
simnandez
67e38df6ee
Trad: Add missing translation
2012-09-28 11:39:23 +02:00
Christophe Battarel
9f15a11b10
update lang files for import (csv options)
2012-09-28 10:28:17 +02:00
Christophe Battarel
15d7266abf
import : add csv options (separator and enclosure)
2012-09-28 10:23:04 +02:00
Laurent Destailleur
d397be12ef
Fix: Redirect on config home.
2012-09-27 23:57:10 +02:00
Laurent Destailleur
6c769cfaf3
Fix: postgresql compatibility
...
Qual: Removed deprecated code
2012-09-27 23:54:47 +02:00
Laurent Destailleur
49e79a2c28
Fix: database compatibility
2012-09-27 23:43:58 +02:00
Laurent Destailleur
e94ddde91d
Fix: Patch calculation field odt
2012-09-27 21:08:32 +02:00
Laurent Destailleur
3a98f6903e
Fix: If a customer has 2000 invoices, creating next one make 2000
...
requests instead of 1.
2012-09-27 20:54:04 +02:00
Laurent Destailleur
a98de7ef02
Fix: No error when hour not provided
2012-09-27 13:25:31 +02:00
Laurent Destailleur
9d732b0876
Fix: nowrap
2012-09-27 12:53:17 +02:00
Regis Houssin
1919604089
Fix: more compatible with multicompany transverse mode
...
Fix: strict mode bubbles
2012-09-27 11:57:46 +02:00
Laurent Destailleur
ad0e3ba4a0
Fix: Better translation
2012-09-27 10:48:40 +02:00
Laurent Destailleur
05a97aaaf0
Fix: Bad alignement when no menus
2012-09-27 01:38:31 +02:00
Laurent Destailleur
051b93c73b
Qual: Code cleaner using field name instead of index number.
...
New: Can use new syntax to define parent of a menu
(fk_mainmenu=&fk_leftmenu=)
2012-09-27 00:05:13 +02:00
Spangaro Alexandre
e4391207e4
Add new dictionnary to edit accountingsystem
2012-09-26 20:37:28 +02:00
Spangaro Alexandre
7cea254255
Continue working on accountancy
2012-09-26 20:37:27 +02:00
Regis Houssin
ca28aa7710
Fix: multicompany transverse mode compatibility
2012-09-26 12:10:25 +02:00
Regis Houssin
e9de123036
Fix: hide menu if empty
2012-09-26 12:09:14 +02:00
Regis Houssin
d08e66b0b8
Fix: add member module compatibility
2012-09-26 10:43:15 +02:00
Laurent Destailleur
81cc311844
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2012-09-25 21:31:20 +02:00
Laurent Destailleur
9e6defab04
Fix on total
2012-09-25 21:30:55 +02:00
Regis Houssin
f77911f25f
Fix: indent
2012-09-25 19:34:18 +02:00
Regis Houssin
817e653519
Fix: add todo for free tag treatment
2012-09-25 18:31:08 +02:00
Christophe Battarel
67333522b0
add ability to remove a product tab if it's defined in a module description
2012-09-25 14:42:58 +02:00
Regis Houssin
d01f68a7af
Fix: try to fix codesniffer error
2012-09-25 12:07:26 +02:00
Regis Houssin
a828d53074
Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop
2012-09-25 08:13:03 +02:00
Regis Houssin
537152f950
Fix: regression
2012-09-25 08:10:12 +02:00
Christophe Battarel
2d911c097b
update french translation for LocalTaxDesc
2012-09-25 08:06:47 +02:00
Regis Houssin
338f0b06d9
Fix: missing changes in migration file
2012-09-25 08:06:39 +02:00
Laurent Destailleur
c5ed476f25
Merge pull request #412 from atm-maxime/develop
...
Task # 104 : Can create an invoice from several orders
2012-09-24 16:05:19 -07:00
Laurent Destailleur
3b8104f013
Merge pull request #410 from marcosgdf/minor
...
Fixed dictionary form
2012-09-24 16:03:51 -07:00
Laurent Destailleur
f17906b331
Merge pull request #413 from aspangaro/develop
...
Add a new column in llx_c_tva
2012-09-24 16:03:05 -07:00
Laurent Destailleur
043e5edc2c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2012-09-24 21:37:36 +02:00
Laurent Destailleur
7d83fdce5b
Fix: Several fixes into date functions
...
Qual: Add PHPUnit tests
2012-09-24 21:37:19 +02:00
Regis Houssin
9792d5a289
Fix: use company name if firstname and lastname not exists
2012-09-24 12:12:37 +02:00
Regis Houssin
1d344ec89c
Fix: increase length, is too restrictive
...
Fix: use company name if lastname and firstname not exists
2012-09-24 11:01:27 +02:00
Regis Houssin
c268a62cab
Fix: try to disable 1900 test
2012-09-24 09:30:37 +02:00
Spangaro Alexandre
ba45295c7e
Working for accountancy
2012-09-24 07:14:39 +02:00
Spangaro Alexandre
96dd6efae0
Minor fix for llx_c_tva
2012-09-24 07:14:38 +02:00
Spangaro Alexandre
a6f9111b54
Add new column in llx_c_tva
2012-09-24 07:14:37 +02:00
Laurent Destailleur
d3ef78df47
Qual: Respect database rules
...
Qual: Add indexes
2012-09-24 00:10:01 +02:00
Laurent Destailleur
a6b2eab439
Revert bad fix.
...
Unit tests are back ok (when tag is @6 or @=, yearoffset
is not zero but must not be applied when replacing yyyy).
Compatibility with 3.2 is also restored.
2012-09-23 22:09:54 +02:00
Laurent Destailleur
0741b907ee
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2012-09-23 22:03:08 +02:00
Laurent Destailleur
0c1651dbf3
Doxygen
2012-09-23 22:02:44 +02:00
Maxime Kohlhaas
bcbc35bd47
Task # 104 : added choice to auto close orders or not + translations
2012-09-23 18:00:30 +02:00
Maxime Kohlhaas
382bee4601
Task # 104 : added link on order list to the multi-orders invoice page
2012-09-23 17:59:50 +02:00
Regis Houssin
d147c360d3
FIXME: this code is useless, $yearoffset is 0 by default
2012-09-23 17:05:08 +02:00
Laurent Destailleur
2519783ce2
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2012-09-23 16:26:13 +02:00
Laurent Destailleur
7fac6b65f6
Fix: Fix for compatibility with previous version and for case "@=".
...
Qual: Add a lot of phpunit tests to validate all get_next_value()
cases.
2012-09-23 16:25:08 +02:00
Spangaro Alexandre
d8481fa19b
Minor fix
2012-09-23 12:05:03 +02:00
Laurent Destailleur
9bbe0e6b1c
Qual: Mutuamize codeby using tpl.
...
New: Support unique field for extrafields
2012-09-22 20:27:06 +02:00
Marcos García
a24031dc19
Fixed dictionary form
...
When creating or modifying an entry, id param was lost
Also, missing </form> added
2012-09-22 15:13:23 +02:00
Regis Houssin
e721c6e723
Fix: more simple too
2012-09-22 10:40:12 +02:00
Regis Houssin
1e3cecf25c
Fix: can use {yy}{mm} or {mm}{yy}
2012-09-22 10:33:25 +02:00
Regis Houssin
2ef521ff30
Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop
2012-09-22 09:19:24 +02:00
