Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-05 00:22:55 +01:00
Code Issues Packages Projects Releases Wiki Activity
52,451 Commits 37 Branches 191 Tags
db656ea4cab97cd0eb39b2cc5e5b6cab753d98eb
Commit Graph

1446 Commits

Author SHA1 Message Date
Laurent Destailleur
fd2166ed11 Minor enhancement on new recurring invoice generation 2016-03-03 10:42:49 +01:00
Laurent Destailleur
3a58613e45 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/listbyyear.php
	htdocs/accountancy/journal/bankjournal.php
	htdocs/compta/facture/list.php
	htdocs/filefunc.inc.php
	htdocs/fourn/facture/list.php
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
	htdocs/projet/activity/index.php
 2016-03-02 23:40:11 +01:00
Laurent Destailleur
846d78dfba FIX Edition of delay (nb of days) for payment term "Immediate" was 
broken.
 2016-02-29 15:43:00 +01:00
Laurent Destailleur
8807222f24 Fix a lot of fixes to have the french vat npr working better 2016-02-27 12:22:39 +01:00
Laurent Destailleur
c86a1a30d5 Fix a lot of fixes to have the french vat npr working better 2016-02-27 11:46:16 +01:00
Laurent Destailleur
8927948bef NEW Add option MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN 2016-02-25 16:27:28 +01:00
Laurent Destailleur
773e5e3b0a Fix: specific contact of object were lost when used to create invoice. 2016-02-25 01:03:37 +01:00
Laurent Destailleur
191394bf88 Fix: specific contact of object were lost when used to create invoice. 2016-02-25 01:02:11 +01:00
Laurent Destailleur
6b9d7763fe Clean code for adding a link to a related object 2016-02-16 22:26:23 +01:00
Laurent Destailleur
7aaae143fc Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/expedition/card.php
 2016-02-15 02:01:58 +01:00
Laurent Destailleur
c1c8ead49f Debug multicurrency module 2016-02-15 00:58:51 +01:00
Laurent Destailleur
518080468e Fix button create template must be visible only if amount is != 0 2016-02-11 10:39:01 +01:00
Laurent Destailleur
d2708a4225 Merge pull request #4475 from atm-ph/new_multicurrency_module 
New multicurrency module
 2016-02-08 14:44:49 +01:00
Laurent Destailleur
c1a6a2880b Debug numbering module for customer payment 2016-02-07 14:22:52 +01:00
phf
1b552a0b3b Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_multicurrency_module 
Conflicts:
	htdocs/core/class/link.class.php
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
 2016-02-03 18:30:59 +01:00
Laurent Destailleur
3c63bf7ffa Merge pull request #4465 from defrance/patch-95 
if FAC_FORCE_DATE_VALIDATION can't change the billing date
 2016-01-30 12:43:52 +01:00
phf
83f90e2b1f Merge branch 'new_multicurrency_module' of github.com:atm-ph/dolibarr into new_multicurrency_module 
Conflicts:
	htdocs/commande/card.php
 2016-01-25 21:50:43 +01:00
phf
373225272b FIX reorder the display of currency and rate on propal/order 
FIX update line on propal/order
NEW add mulitcurrency on customer invoice
 2016-01-23 16:01:55 +01:00
Laurent Destailleur
93b2013aa7 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/compta/bank/card.php
	htdocs/projet/tasks/list.php
 2016-01-22 03:29:55 +01:00
Laurent Destailleur
cceeefb7c2 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/societe/index.php
 2016-01-22 03:25:30 +01:00
BENKE Charlie
2036f17df5 if FAC_FORCE_DATE_VALIDATION can't change the billing date 2016-01-19 21:45:44 +01:00
phf
d213fbae08 FIX invoice situation 2016-01-13 13:42:58 +01:00
Frédéric FRANCE
92885065c6 Update facture.php 2016-01-12 10:09:02 +01:00
Laurent Destailleur
87c236b534 Fix when error creating invoice from predefined invoice, we must go back 
to create page from same predefined invoice.
 2016-01-08 16:30:43 +01:00
Bahfir Abbes
e415a3ddf2 Update facture.php 
fix change customer function in customer invoices - include customers or prospects only
 2015-12-14 15:01:29 +01:00
Laurent Destailleur
7f3531a04c Enhance script to track duplicate translation string and use it to 
remove around 50 duplicates.
 2015-12-06 13:34:57 +01:00
Laurent Destailleur
574b270da0 Work on the "mass action" feature. Can run mass action on 
result of a select.
 2015-12-02 22:00:39 +01:00
philippe grand
42ed3d2bb7 [Qual] Uniformize code 2015-11-18 16:05:41 +01:00
philippe grand
f308606ee1 [Qual] Uniformize code 2015-11-15 07:47:35 +01:00
Laurent Destailleur
01058be44c NEW Introduce a "code" into fiels to describe vat. This will allow to 
suggest different vat lines with same value with ability to
differentiate them.
 2015-11-14 17:53:58 +01:00
Laurent Destailleur
ab177b43af Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	ChangeLog
	htdocs/.gitignore
	htdocs/comm/mailing/card.php
	htdocs/commande/list.php
	htdocs/compta/facture.php
	htdocs/expedition/class/expedition.class.php
 2015-11-13 12:35:10 +01:00
Laurent Destailleur
93be4305c4 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	build/makepack-dolibarr.pl
	htdocs/accountancy/customer/card.php
	htdocs/accountancy/customer/list.php
	htdocs/accountancy/supplier/card.php
	htdocs/accountancy/supplier/list.php
	htdocs/commande/card.php
	htdocs/commande/class/commande.class.php
	htdocs/fichinter/card.php
	htdocs/societe/rib.php
 2015-11-13 12:18:46 +01:00
Laurent Destailleur
eac80d7db4 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	ChangeLog
	build/debian/changelog
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
 2015-11-13 11:43:29 +01:00
Laurent Destailleur
ea6fe02f18 Merge pull request #3923 from altatof/customerinfos 
NEW FEATURE PROPOSAL: on propale, order or invoice creation from
 2015-11-13 00:35:39 +01:00
Laurent Destailleur
b2285ca5e0 Option MAIN_EMAIL_ADD_TRACK_ID is now set to 1 by default. 
All emails sent from Dolibarr have a dedicated tracking id.
 2015-11-12 21:25:01 +01:00
Christophe Battarel
cc35f2b738 Merge branch 'develop' into customerinfos 2015-11-11 15:46:22 +01:00
Christophe Battarel
0c40a6dda5 add hidden constant 2015-11-11 15:32:42 +01:00
Marcos García de La Fuente
b4c3804c91 FIX #3928 Creating a Customer order and a Customer invoice from a project, does not inherit payment conditions and method of payment of customer card 2015-11-07 13:21:03 +01:00
Christophe Battarel
f52ae35dc6 NEW FEATURE PROPOSAL: on propale, order or invoice creation from 
scratch, reload page after customer selection so its informations can be
loaded
 2015-11-06 16:14:00 +01:00
Florian HENRY
121d2beb80 fix spacing 2015-11-06 10:34:18 +01:00
Florian HENRY
126b5d6eca FIX : only active customer should be available into select list 
thirdparty on invoice creation
 2015-11-06 10:19:10 +01:00
Florian HENRY
8d829dca32 FIX : only active customer should be return into new invoice creation 
select list
 2015-11-06 09:49:02 +01:00
Laurent Destailleur
1f4481a6b0 Merge pull request #3172 from atm-maxime/new_creditnote 
NEW Add hidden option INVOICE_CREDIT_NOTE_STANDALONE to allow to create credit note without invoice
 2015-11-05 02:45:15 +01:00
Laurent Destailleur
a7795f25fc Fix Must make a difference between a buying/cost price == '' (not 
provided) and buying/cost price = '0'. We must use default value only if
value is '' and not if forced to '0'.
 2015-11-04 17:51:15 +01:00
Laurent Destailleur
da0aa2f937 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/pdf.lib.php
	htdocs/langs/en_US/main.lang
	htdocs/product/list.php
	htdocs/product/stock/mouvement.php
 2015-11-02 19:31:42 +01:00
Laurent Destailleur
3ba97627ff FIX Default thirdparty when cloning invoice was not set. 2015-11-02 15:50:03 +01:00
Maxime Kohlhaas
bd831b1f24 Merge branch 'new_creditnote' of github.com:atm-maxime/dolibarr into new_creditnote 2015-10-26 09:40:50 +01:00
Laurent Destailleur
080ba15e0d FIX The price per level just never correctly manage the vat. Vat is not 
per level but depends on seller and supplyer. I kept a hidden option to
keep old behaviour that was bugged.
 2015-10-25 22:50:05 +01:00
Laurent Destailleur
1f1e72f2b6 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/filefunc.inc.php
	htdocs/fourn/facture/list.php
	htdocs/main.inc.php
 2015-10-25 19:54:41 +01:00
Laurent Destailleur
22979523db Try a fix for #3742 2015-10-20 02:34:53 +02:00