Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-21 17:01:19 +01:00
Code Issues Packages Projects Releases Wiki Activity
40,052 Commits 36 Branches 190 Tags
abc96b51fa815cd039f340984927e14b768aeead
Commit Graph

4632 Commits

Author SHA1 Message Date
Laurent Destailleur
a1e7333613 Fix: bug preventing creation of predefined invoice. 
Also added phpunit test to detect it if it occurs again.
 2013-09-16 13:42:42 +02:00
Laurent Destailleur
16e2de1d7b Merge pull request #1228 from csalvador/develop 
Added a field to group by to avoid error with mysql strict mode
 2013-09-12 02:06:31 -07:00
simnandez
b36dc08e00 Remove unnecessary code 2013-09-12 09:59:23 +02:00
simnandez
c1c423dcac [ task #1060 ] Register fields localtax(1|2)_type into details tables 2013-09-10 17:49:36 +02:00
simnandez
634f70a74d New: [ task #1060 ] Register fields localtax(1|2)_type into details 
tables. Invoices
 2013-09-10 17:07:38 +02:00
Cédric Salvador
13e86e9b0d Added a field to group by to avoid error with mysql strict mode 2013-09-10 16:45:05 +02:00
Laurent Destailleur
72557437ef Checkstyle 2013-09-10 14:19:36 +02:00
Cédric Salvador
0c93c6f0b1 format 2013-09-09 09:55:51 +02:00
Cédric Salvador
0d23f78e9f indentation 2013-09-09 09:55:51 +02:00
Cédric Salvador
de1dec7c34 don't display warehouse selection if there's only one 
Conflicts:
	htdocs/compta/facture.php
	htdocs/langs/en_US/stocks.lang
	htdocs/langs/fr_FR/stocks.lang
 2013-09-09 09:55:51 +02:00
Laurent Destailleur
74a50d8d6c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-09-07 19:51:00 +02:00
Laurent Destailleur
082cf0b487 Revert "Avoid silly assignment" 
This reverts commit fa51e310b8.
 2013-09-07 19:27:35 +02:00
Laurent Destailleur
305c1d63a7 Qual: Uniformize code. No useless redirect. use GETPOST. 2013-09-06 13:25:45 +02:00
Laurent Destailleur
c151ef7b87 Qual: Remove duplicate form instanciation. 2013-09-06 12:10:09 +02:00
Raphaël Doursenaud
e762042828 Fixed typos 2013-09-05 18:06:51 +02:00
Raphaël Doursenaud
fa51e310b8 Avoid silly assignment 2013-09-05 17:19:30 +02:00
Laurent Destailleur
10c2bdc193 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/categories/class/categorie.class.php
	htdocs/core/boxes/box_ficheinter.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/extrafields.class.php
	htdocs/langs/fr_FR/compta.lang
 2013-09-04 15:13:38 +02:00
Florian Henry
853758a422 REplicate extrafield value 
proposal=>invoice,proposal=>invoice,proposal=>order, order=>invoice
 2013-08-30 14:38:04 +02:00
Florian Henry
b5731bab7e All deposit inoice form order 2013-08-30 10:46:05 +02:00
Laurent Destailleur
b39046ca7e Fix: Add missing syslog 2013-08-28 13:05:14 +02:00
Laurent Destailleur
7f549e60f2 Fix: Bad selection of years into graphics 2013-08-27 12:02:33 +02:00
Laurent Destailleur
657c4d6e90 Fix: Fix graph for product distribution. 
Add limit and add entry other.
 2013-08-27 11:54:07 +02:00
Laurent Destailleur
67892575be Merge pull request #1167 from PaulPoulain/999-develop 
T999-develop: link invoice to a command
 2013-08-25 03:23:57 -07:00
Laurent Destailleur
8c90ad8afa Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	ChangeLog
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.formfile.class.php
	htdocs/core/modules/expedition/doc/pdf_expedition_rouget.modules.php
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/core/modules/modFacture.class.php
	htdocs/core/modules/modFournisseur.class.php
	htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php
	htdocs/expedition/fiche.php
	htdocs/fourn/fiche.php
	htdocs/langs/el_GR/admin.lang
	htdocs/langs/el_GR/agenda.lang
	htdocs/langs/el_GR/banks.lang
	htdocs/langs/el_GR/bills.lang
	htdocs/langs/el_GR/bookmarks.lang
	htdocs/langs/el_GR/boxes.lang
	htdocs/langs/el_GR/cashdesk.lang
	htdocs/langs/el_GR/categories.lang
	htdocs/langs/el_GR/commercial.lang
	htdocs/langs/el_GR/companies.lang
	htdocs/langs/el_GR/compta.lang
	htdocs/langs/el_GR/contracts.lang
	htdocs/langs/el_GR/cron.lang
	htdocs/langs/el_GR/deliveries.lang
	htdocs/langs/el_GR/dict.lang
	htdocs/langs/el_GR/donations.lang
	htdocs/langs/el_GR/ecm.lang
	htdocs/langs/el_GR/errors.lang
	htdocs/langs/el_GR/exports.lang
	htdocs/langs/el_GR/externalsite.lang
	htdocs/langs/el_GR/ftp.lang
	htdocs/langs/el_GR/help.lang
	htdocs/langs/el_GR/holiday.lang
	htdocs/langs/el_GR/install.lang
	htdocs/langs/el_GR/interventions.lang
	htdocs/langs/el_GR/languages.lang
	htdocs/langs/el_GR/ldap.lang
	htdocs/langs/el_GR/mailmanspip.lang
	htdocs/langs/el_GR/mails.lang
	htdocs/langs/el_GR/main.lang
	htdocs/langs/el_GR/margins.lang
	htdocs/langs/el_GR/members.lang
	htdocs/langs/el_GR/opensurvey.lang
	htdocs/langs/el_GR/orders.lang
	htdocs/langs/el_GR/oscommerce.lang
	htdocs/langs/el_GR/other.lang
	htdocs/langs/el_GR/paybox.lang
	htdocs/langs/el_GR/paypal.lang
	htdocs/langs/el_GR/products.lang
	htdocs/langs/el_GR/projects.lang
	htdocs/langs/el_GR/propal.lang
	htdocs/langs/el_GR/sendings.lang
	htdocs/langs/el_GR/shop.lang
	htdocs/langs/el_GR/sms.lang
	htdocs/langs/el_GR/stocks.lang
	htdocs/langs/el_GR/suppliers.lang
	htdocs/langs/el_GR/trips.lang
	htdocs/langs/el_GR/users.lang
	htdocs/langs/el_GR/withdrawals.lang
	htdocs/langs/el_GR/workflow.lang
	htdocs/margin/productMargins.php
 2013-08-24 22:41:32 +02:00
simnandez
fd759ade76 Fix: [ bug #1039 ] Pre-defined invoices conversion 2013-08-23 18:04:10 +02:00
simnandez
c242d66530 Fix: [ bug #1039 ] Pre-defined invoices conversion 2013-08-23 18:03:16 +02:00
lalaina rasamoelina
f913422e62 T999-develop: link invoice to a command 
If you do not create the invoice from the order,
it can connect to a command by clicking "bind a command"
 2013-08-22 10:17:03 +02:00
Christophe Battarel
dd32dbacb5 Fix retrieving of margin info when invoice created automatically from order (used by workflow module) 2013-08-21 18:55:11 +02:00
Christophe Battarel
29d329a1d2 ability to define margin rate on quotes, orders, invoices 
more to come : same on edit, user permissions
 2013-08-12 15:34:09 +02:00
Laurent Destailleur
59c1f54d68 New: Enhance DolGraph class for pie charts. 2013-08-09 19:19:48 +02:00
Laurent Destailleur
23516a466c Fix: Pb with predefined invoices 2013-08-06 23:56:13 +02:00
Laurent Destailleur
7438809ab5 Make predefined invoice feature easier to use. 2013-08-06 23:55:17 +02:00
Laurent Destailleur
acf3db8512 Fix: Pb with predefined invoices 2013-08-06 23:50:12 +02:00
Laurent Destailleur
7a8d28f135 Several fix for last pull request: 
- A property of an element must be shown under another element
- Property that may be page content must not be output into a list.
- Bad W3C (<br> must not be <br />)
- Must not use picto to edit a property to define a link to a page
(replaced with generic sheet picto).
 2013-08-06 19:12:26 +02:00
Laurent Destailleur
7a17d52dad Merge pull request #1157 from PaulPoulain/961-develop 
T961-develop: Put the private note in the bill list
 2013-08-06 09:44:28 -07:00
lalaina rasamoelina
a8ba4e1861 T961-develop: Put the private note in the bill list 
In the invoice list, if there are the private notes,we print them and we can edit them
htdocs/compta/facture/liste.php
 2013-08-06 16:36:16 +02:00
Laurent Destailleur
afae841ae4 Fix: Permissions on files 2013-08-06 00:36:21 +02:00
Laurent Destailleur
c41a955cbe Fix: Permissions on files 2013-08-06 00:36:04 +02:00
Laurent Destailleur
218e9f5b33 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-08-05 18:55:38 +02:00
Laurent Destailleur
2336a260d3 New: Add line "minimum amount desired into bank graph". 2013-08-05 18:54:03 +02:00
Laurent Destailleur
85572a4bd1 New: Start to work on box for product distributions 
Qual: Start to move code of dol_print_graph function into class
DolGraph.
 2013-08-05 17:19:49 +02:00
Maxime Kohlhaas
229c2d890f Add possibility to define default VAT accountancy code for purchase 2013-08-02 10:43:53 +02:00
Laurent Destailleur
37592afa7e New: Add hidden option BANK_DISABLE_DIRECT_INPUT 2013-07-31 18:40:09 +02:00
Laurent Destailleur
db8af86111 Fix: W3C 2013-07-30 18:36:13 +02:00
Laurent Destailleur
67820774bb Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	ChangeLog
	htdocs/commande/fiche.php
	htdocs/core/class/extrafields.class.php
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
 2013-07-27 14:21:47 +02:00
Laurent Destailleur
3c6b1f17d1 Fix: print of a function that already contains the print. 2013-07-27 14:10:57 +02:00
Laurent Destailleur
385d3612c5 Merge pull request #1136 from jfefe/extrarequired 
Missing checks on extrafields
 2013-07-27 03:09:44 -07:00
jfefe
bddbc6f6b2 Fix : show input fields if missing required extrafield when editing 
invoice
 2013-07-26 16:02:48 +02:00
Laurent Destailleur
5608e320f7 New: Can add a suffix into filename of template after -. This may be 
used in future as specific criteria to filter list of numbering models
to show.
 2013-07-26 15:10:56 +02:00
jfefe
371b40cc76 Do not create invoice if required extrafields are empty 2013-07-26 13:22:22 +02:00