Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-28 19:53:20 +01:00
Code Issues Packages Projects Releases Wiki Activity
40,390 Commits 38 Branches 191 Tags
f34aadef3df57794de74006bc2c2c9fc4da6be12
Commit Graph

1004 Commits

Author SHA1 Message Date
Laurent Destailleur
fb92e13650 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	scripts/invoices/email_unpaid_invoices_to_customers.php
	scripts/invoices/email_unpaid_invoices_to_representatives.php
 2013-05-15 22:35:41 +02:00
Laurent Destailleur
49735b8d39 New: Add option "filter=bank" onto script rebuild_merge_pdf.php to 
merge PDF that has one payment on a specific bank account.
 2013-05-15 17:52:56 +02:00
Laurent Destailleur
e95db78d50 New: Add script export-bank-receipts. 2013-05-15 13:41:31 +02:00
Laurent Destailleur
79d2dea26a Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	htdocs/langs/en_US/errors.lang
	htdocs/langs/fr_FR/errors.lang
 2013-05-14 03:04:42 +02:00
Laurent Destailleur
55c8522988 Update changelog 2013-05-14 01:34:24 +02:00
simnandez
83ffaecc40 Update ChangeLog 2013-05-13 17:37:56 +02:00
simnandez
0c853b3ebd Fix: Some bugs on withdrawal rejects 2013-05-13 17:35:30 +02:00
simnandez
5fe70e0bee Fix: Some bugs on withdrawal rejects 2013-05-13 17:15:23 +02:00
fhenry
760ae88f39 [ task #531 ] Add a duration on tasks 2013-05-13 17:08:36 +02:00
fhenry
7728043122 Changelog update 2013-05-12 11:46:30 +02:00
Marcos García
c21390ab83 New: [ task #858 ] Holiday module: note on manual holiday assignation 2013-05-04 20:08:17 +02:00
simnandez
15ede98fe7 New: [ task #877 ] Reorganize menus. Init works 
Add migration script 3.4 to 3.5
 2013-05-04 01:22:09 +02:00
Laurent Destailleur
7382a97223 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
 2013-05-03 10:13:31 +02:00
Marcos García
c65620ab62 Merge branch '3.3' of git://github.com/Dolibarr/dolibarr into bug-866 
Conflicts:
	ChangeLog
 2013-05-03 08:17:58 +02:00
Laurent Destailleur
fc0d5abd14 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	ChangeLog
	htdocs/compta/prelevement/bons.php
	htdocs/compta/prelevement/fiche-stat.php
	htdocs/contact/class/contact.class.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/core/modules/modSociete.class.php
	htdocs/projet/fiche.php
	test/phpunit/FilesLibTest.php
 2013-05-03 00:15:02 +02:00
fhenry
7e47b37ade Fix [ bug #788 ] Date of linked interventions are not shown 2013-05-02 13:56:14 +02:00
Marcos García
a9e63610ae Fixed bug #866: Standing order from an invoice suggests invoice total amount instead of remaining to pay 2013-05-01 20:40:29 +02:00
fhenry
3933fb318c update change log 2013-04-30 21:57:34 +02:00
fhenry
e9f02ebacf Update change log 2013-04-30 21:45:40 +02:00
simnandez
8a266058c1 Removed duplicated changelog entries and ordered fixes by bug ID 2013-04-30 12:05:21 +02:00
Marcos García
947bda1af8 Removed duplicated entries and ordered fixes by bug ID 2013-04-29 21:37:25 +02:00
simnandez
52b9a3ad91 Update ChangeLog 2013-04-29 12:49:56 +02:00
simnandez
00adb1b9ab Fix: [ bug #855 ] Holiday approval email in French 2013-04-29 12:46:07 +02:00
Marcos García
54fc731df7 Fix: [bug #856] Mail error if destination user doesn't have an email 2013-04-28 01:58:57 +02:00
Laurent Destailleur
80e470a4ce Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/facture.php
	htdocs/compta/facture/impayees.php
	htdocs/compta/index.php
	htdocs/core/boxes/box_produits_alerte_stock.php
	htdocs/core/class/html.form.class.php
	htdocs/core/modules/syslog/mod_syslog_file.php
	htdocs/fourn/facture/impayees.php
	htdocs/holiday/class/holiday.class.php
	htdocs/holiday/fiche.php
 2013-04-28 01:24:58 +02:00
Marcos García
1065645fb6 Fix: [ bug #857 ] Invoice created from shipment does not have the order discount 2013-04-27 13:45:25 +02:00
Laurent Destailleur
ed4c18b9d3 Update changelog. 
Fix: Fix template ODS.
 2013-04-22 13:15:33 +02:00
Laurent Destailleur
89ad634230 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/class/hookmanager.class.php
	htdocs/langs/fr_FR/holiday.lang
 2013-04-22 01:39:49 +02:00
Marcos García
82e3a8d0b9 New: [ task #823 ] Shipping_validate email notification 2013-04-21 14:14:30 +02:00
simnandez
7b0c7c1a55 Update ChangeLog 2013-04-20 22:42:06 +02:00
Laurent Destailleur
162ccf68b6 Merge pull request #841 from FHenry/develop 
fix [ bug #825 ] User first name not visible into users->perms
 2013-04-19 17:21:16 -07:00
Marcos García
458b1cdf60 Improved dictionary translations + minor bug fix 2013-04-19 23:33:54 +02:00
Marcos García
becd40a825 Fixed bug #828: Error when code_region is not a number in llx_c_regions (with postgres) 2013-04-19 15:38:24 +02:00
fhenry
c0c1de7992 [ task #826 ] Increasing stock when deleting an invoice 2013-04-18 08:40:29 +02:00
Laurent Destailleur
29b3973611 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-04-17 23:17:21 +02:00
Laurent Destailleur
ff2adc40a4 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	ChangeLog
	htdocs/admin/dict.php
	htdocs/comm/prospect/fiche.php
 2013-04-17 23:15:57 +02:00
fhenry
4927aae891 [ task #741 ] Gestion des interventions/Add intervention box 2013-04-17 16:20:01 +02:00
fhenry
03e57c229a Update changelog 2013-04-17 10:00:12 +02:00
fhenry
2b05cb3cea Update changelog 2013-04-17 09:52:30 +02:00
fhenry
2bac3982ba Update Changelog 2013-04-17 09:48:44 +02:00
fhenry
e7cec6d410 update change log 2013-04-17 09:32:35 +02:00
simnandez
e0ec88a286 Update ChangeLog 
Conflicts:
	ChangeLog
 2013-04-16 09:03:38 +02:00
simnandez
90a2a86dbb Update ChangeLog 2013-04-16 08:59:01 +02:00
simnandez
76132206bf Fix: Bad link to all proposals into Third party card if customer is 
prospect
 2013-04-15 17:12:31 +02:00
Marcos García
462719331e Updated changelog 2013-04-15 09:13:00 +02:00
Marcos García
0e34df43b1 Updated changelog 2013-04-14 13:09:00 +02:00
Laurent Destailleur
baad1ffc56 New: Add link to autofill/reset with quantity to ship when creating 
a delivery receipt.
 2013-04-14 12:19:21 +02:00
Laurent Destailleur
e5a945ba5b Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	ChangeLog
	htdocs/admin/propal.php
	htdocs/compta/journal/purchasesjournal.php
	htdocs/compta/journal/sellsjournal.php
	htdocs/core/class/conf.class.php
	htdocs/core/class/hookmanager.class.php
	htdocs/core/lib/files.lib.php
	htdocs/core/modules/mailings/contacts2.modules.php
	htdocs/langs/ca_ES/admin.lang
	htdocs/langs/en_US/admin.lang
	htdocs/langs/es_ES/admin.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/public/demo/index.php
 2013-04-14 01:46:33 +02:00
Laurent Destailleur
bda39f25bf New: Default aprrover for holidays i sby default hierchical parent. 2013-04-14 01:04:11 +02:00
Marcos García
486425d258 Merge branch '3.3' into bug-817 
Conflicts:
	ChangeLog
 2013-04-13 23:58:05 +02:00