Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
54,329 Commits 36 Branches 189 Tags
9b1caefbf9c68ba433333efbeb125cb15d4b10dd
Commit Graph

6584 Commits

Author SHA1 Message Date
simnandez
54f963f8ae Trad: Fix: A better fix for status/list of orders. 
There was a confusion because of bad translation key StatusOrderToBill
that in fact mean "StatusOrderDelivered".
 2013-03-16 22:32:03 +01:00
Laurent Destailleur
33a7692fbc Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/exports/class/export.class.php
 2013-03-16 17:07:35 +01:00
Laurent Destailleur
013b7eca10 Fix: A better fix for status/list of orders. 
There was a confusion because of bad translation key StatusOrderToBill
that in fact mean "StatusOrderDelivered".
More explanation:
http://wiki.dolibarr.org/index.php/Module_Customers_Orders#Life_cycle_.2F_Business_rules
 2013-03-16 17:02:13 +01:00
Laurent Destailleur
2da3fb68a0 Merge pull request #751 from jfefe/extrasep 
New type of extrafield : separator
 2013-03-16 07:41:34 -07:00
Grand Philippe
7a69066dc8 enhancement of suppliers module 2013-03-16 15:24:14 +01:00
fhenry
e71103ed02 task #768: 
https://doliforge.org/tracker/?func=detail&aid=768&group_id=144 
task #769 :
https://doliforge.org/tracker/?func=detail&aid=769&group_id=144
 2013-03-16 09:23:34 +01:00
jfefe
5f1141675c Add constants into config of ODT document for propal : can choose wich ODT will be used on creation and when close to bill or not. 2013-03-16 01:10:21 +01:00
jfefe
654e99df8c Work on new type of extrafield : separator with no field stored in database 2013-03-15 18:56:10 +01:00
simnandez
c0e5cacafc Fix: Bad orders list viewstatut filter if expeditons module is disabled 2013-03-15 16:18:14 +01:00
Grand Philippe
36e99e100b fix trad 2013-03-15 12:13:23 +01:00
Grand Philippe
010207532f fix trad 2013-03-15 10:12:40 +01:00
Laurent Destailleur
298ba17e8f Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/exports/class/export.class.php
	htdocs/webservices/server_user.php
 2013-03-15 01:10:56 +01:00
Laurent Destailleur
9729e83e66 Fix: Do not use deprecated function 
New: ajax constant on off can be reversed
 2013-03-13 23:05:34 +01:00
Laurent Destailleur
277784af25 New: Start to work on a cron module 2013-03-13 19:55:21 +01:00
Laurent Destailleur
a47616cb95 Enhance script 2013-03-13 18:27:05 +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
Grand Philippe
5ed94ae9be fix trad 2013-03-13 11:10:31 +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
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
Grand Philippe
dd248e9d58 fix : dyslexia 2013-03-11 17:19:03 +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
Grand Philippe
979a36e941 fix some translations 2013-03-11 15:18:24 +01:00
Grand Philippe
06e931632d fix some translations 2013-03-11 14:51:48 +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
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
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
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
Cedric GROSS
d16691c856 Add trigger BILL_UNVALIDATE when invoice is unvalidate 2013-03-09 17:38:35 +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
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
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
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
jfefe
88a042ec41 Prepare invoice admin page to add extrafield support 2013-03-06 03:36:43 +01:00
Laurent Destailleur
9bced140e6 More explanation onto the php session parameter. 2013-03-06 00:45:43 +01:00
fhenry
da17302349 [ task #743 ] GED : Add aministration option to disabled autotree to 
display
 2013-03-04 11:16:46 +01:00
simnandez
a811121daf [ task #731 ] Uniformize ref generation 2013-03-02 16:50:36 +01:00
simnandez
7d9d575e40 [ task #731 ] Uniformize ref generation. Propals 2013-03-02 15:57:26 +01:00
Raphaël Doursenaud
e76ffca9ba Removed UTF-8 BOM 2013-03-01 14:11:42 +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
simnandez
8e6cde61c0 Trad: Update translations 2013-02-21 18:44:11 +01:00