Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-17 06:51:23 +01:00
Code Issues Packages Projects Releases Wiki Activity
36,922 Commits 36 Branches 190 Tags
a6233a738c2f67e557b54b144066a7cb15c728e8
Commit Graph

4405 Commits

Author SHA1 Message Date
Grand Philippe
c5e742278e fix : trad error 2013-03-24 07:11:44 +01:00
fhenry
1e04ff8bbf Add Cron spanish translation (provided by david@luminososmarmenor.com) 2013-03-23 20:36:32 +01:00
fhenry
d84cd86a50 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop

Merge Cron module
 2013-03-23 20:24:28 +01:00
Laurent Destailleur
d54b0d139d Merge pull request #771 from grandoc/develop 
fix error translation
 2013-03-23 12:03:43 -07:00
Laurent Destailleur
c3589e9785 Some debug into cron module: 
- Because cron is a module, constant must start with CRON_.
- Miscellanous fixes.
- For external link to run jobs from url, we must forge url using conf
file and not autodetect url.
 2013-03-23 19:23:17 +01:00
Grand Philippe
2c718b740e Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop 2013-03-23 19:09:08 +01:00
fhenry
8971e6fe15 [ task #710 ] Envoi de mail 2013-03-23 14:39:23 +01:00
eldy
90025f9c13 Work on revenue stamp 2013-03-23 13:07:25 +01:00
Grand Philippe
3fc8dffadf Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop 2013-03-23 10:22:13 +01:00
Grand Philippe
ea296d8429 fix error translation 2013-03-22 19:24:26 +01:00
simnandez
e9cbf94e06 Trad: Add es_ES and ca_ES missing translations 2013-03-22 17:31:43 +01:00
Laurent Destailleur
5920bb5ae2 Merge pull request #768 from FHenry/develop_cron 
[ task #122 ] Create a scheduled cron module
 2013-03-22 07:49:13 -07:00
fhenry
0215031632 [ task #122 ] Create a scheduled cron module 2013-03-22 14:45:20 +01:00
Grand Philippe
07940d719b fix error translation 2013-03-22 13:00:26 +01:00
Laurent Destailleur
4949d74267 New: Add a tab "consumption" on thirdparties to list products 
bought/sells.
(i implement list for customer invoices and supplier orders, need
someone to finish work for customer orders and supplier invoices)
 2013-03-22 00:02:25 +01:00
Laurent Destailleur
a2763df9e7 Qual: Start to clean the simple accountancy moule. 2013-03-20 21:41:16 +01:00
Laurent Destailleur
a3435ab889 Merge remote-tracking branch 'origin/3.3' into develop 2013-03-20 15:32:32 +01:00
Christophe Battarel
e2f28b6c51 remove experimental commissions module 2013-03-18 15:40:56 +01:00
Laurent Destailleur
45a6717dd3 Merge pull request #752 from FHenry/develop 
task #768  &  task #769
 2013-03-18 05:02:38 -07:00
Laurent Destailleur
7703537b96 New: Work on cron module 2013-03-17 19:39:53 +01:00
eldy
1d09e122c0 Some debug with pgsql 2013-03-17 14:28:57 +01:00
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