Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-13 13:01:27 +01:00
Code Issues Packages Projects Releases Wiki Activity
61,071 Commits 36 Branches 190 Tags
8f34de1036680906ebdb8c05e6460077b5dc4b43
Commit Graph

2750 Commits

Author SHA1 Message Date
Ferran Marcet
0df39149c4 Fix: Hidden option not showing correctly 2017-01-25 19:28:20 +01:00
fappels
2be6011069 Fix product elephant verify for service 2017-01-23 20:59:32 +01:00
Laurent Destailleur
39151d7a74 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-01-22 12:14:18 +01:00
Laurent Destailleur
65f7de8f64 Fix css and look 5.0 2017-01-22 12:13:32 +01:00
Laurent Destailleur
9a5670787f Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-01-21 12:26:50 +01:00
Laurent Destailleur
809e3ce4d5 Debug browser notification 2017-01-20 20:10:16 +01:00
Laurent Destailleur
0a4b29e1c4 Merge pull request #6284 from atm-gauthier/FIX_pdf_invoice_with_situation 
Fix pdf invoice with situation
 2017-01-20 18:10:24 +01:00
Juanjo Menent
2374aa351e Merge remote-tracking branch 'upstream/develop' into develop 2017-01-20 15:55:51 +01:00
Laurent Destailleur
412be59f78 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2017-01-20 12:09:39 +01:00
gauthier
a944c82d86 FIX : $progress_width initialized 2017-01-19 09:11:06 +01:00
Laurent Destailleur
227b616ca3 Fix bad default value 2017-01-18 16:51:42 +01:00
Laurent Destailleur
ed98227303 Merge pull request #6292 from marcosgdf/remove-pdf-create-functions 
NEW Removed deprecated pdf_create functions
 2017-01-18 16:48:23 +01:00
Laurent Destailleur
82492dc023 Fix oauth2 token generation for Google. The refresh token was not 
received.
 2017-01-17 20:05:10 +01:00
Laurent Destailleur
16779be162 Fix missing email/multicompany field 2017-01-17 10:51:30 +01:00
Laurent Destailleur
1ded1bd52a Fix: missing email 2017-01-17 10:34:35 +01:00
Marcos García de La Fuente
8225b06018 NEW Removed commande_pdf_create, contract_pdf_create,expedition_pdf_create, facture_pdf_create, delivery_order_pdf_create, task_pdf_create, project_pdf_create, propale_pdf_create, supplier_invoice_pdf_create, supplier_order_pdf_create, supplier_proposal_pdf_create deprecated functions 2017-01-16 21:59:02 +01:00
Philippe GRAND
2525a6e3a4 update code for next php versions 2017-01-16 17:24:50 +01:00
Laurent Destailleur
1b1bab94ca More complete commit for #6114 2017-01-16 10:43:22 +01:00
Laurent Destailleur
9d72f1df62 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-01-16 01:12:11 +01:00
Laurent Destailleur
a07a77e323 Not yet ready for php 7.1 2017-01-16 01:11:38 +01:00
Laurent Destailleur
d95ac3bbdd Fix warning 2017-01-16 00:16:20 +01:00
Laurent Destailleur
7bccaff28a Fix remove warnings 2017-01-15 23:32:14 +01:00
Marcos García de La Fuente
d09a3628c5 Merge branch 'develop' into prod-attr 
# Conflicts:
#	htdocs/compta/facture.php
 2017-01-14 23:59:14 +01:00
Juanjo Menent
6cc3ef0c99 NEW: Events notifications in browser 2017-01-13 16:08:49 +01:00
gauthier
a90ec7a8c7 FIX : hidetop progression 2017-01-13 14:59:29 +01:00
gauthier
1886e68731 FIX : progress size 2017-01-12 17:07:22 +01:00
gauthier
307c06dfc3 FIX : pdf invoice when we use situation 2017-01-12 16:26:09 +01:00
Laurent Destailleur
9671810d13 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-01-12 11:33:25 +01:00
Laurent Destailleur
2c6672d17a Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/tpl/login.tpl.php
 2017-01-12 11:32:51 +01:00
Laurent Destailleur
25dcb10c1d Merge pull request #6066 from atm-florian/dev_exportthirdparty 
NEW : Can export thirdparty with sale representative that is a subordinate (Need hidden option SOCIETE_EXPORT_SUBORDINATES_CHILDS)
 2017-01-12 11:17:15 +01:00
Laurent Destailleur
7476a3c8ae Fix error during migration 2017-01-12 10:59:27 +01:00
Alexis Algoud
8b4a43ec77 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_inventory_coreobject_listview 2017-01-09 10:31:05 +01:00
Laurent Destailleur
f00f3101d9 Merge pull request #6013 from aljawaid/develop 
NEW: Make Top Menu Entries Independent Translation Strings
 2017-01-07 20:45:44 +01:00
Laurent Destailleur
9cfc8d4095 Fix several problems into OAuth2 module. 2017-01-06 19:58:46 +01:00
arnaud
b813144edb NEW generation ODT 2017-01-06 16:44:09 +01:00
Alexis Algoud
370be70e46 Merge branch '5.0' of https://github.com/Dolibarr/dolibarr into NEW_inventory_coreobject_listview 2017-01-03 16:30:50 +01:00
Laurent Destailleur
c635baa848 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/langs/en_US/errors.lang
 2017-01-03 01:34:15 +01:00
Laurent Destailleur
157b17b6d5 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 
Conflicts:
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/errors.lang
 2017-01-03 01:31:58 +01:00
Laurent Destailleur
b642a3a602 Prepare release 5.0 2016-12-31 16:35:56 +01:00
Marcos García de La Fuente
47a444b2ab Merge branch 'develop' into prod-attr 2016-12-27 15:54:53 +01:00
Marcos García de La Fuente
98599b0bbf FIX #6227 Document models table header "Unit" is shown in 2 lines in Spanish 2016-12-27 12:56:49 +01:00
Laurent Destailleur
bbd3734a21 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/filefunc.inc.php
 2016-12-26 12:42:23 +01:00
Marcos García de La Fuente
5669f734b8 Merge branch 'develop' into prod-attr 
# Conflicts:
#	htdocs/comm/propal/card.php
#	htdocs/commande/card.php
#	htdocs/compta/facture.php
#	htdocs/core/class/html.form.class.php
#	htdocs/core/tpl/objectline_create.tpl.php
#	htdocs/fourn/commande/card.php
#	htdocs/fourn/facture/card.php
#	htdocs/install/mysql/migration/4.0.0-5.0.0.sql
 2016-12-24 21:39:40 +01:00
Laurent Destailleur
8ce5ed0192 Fix position of discount on PDF with US letter format 2016-12-23 15:57:31 +01:00
Laurent Destailleur
9948b6d4d9 Merge pull request #6202 from GPCsolutions/supplierpaymentdateexport 
NEW: Export max payment date with supplier invoices
 2016-12-23 00:50:30 +01:00
Laurent Destailleur
594ecf400b Merge pull request #6196 from aspangaro/5.0-b12 
Fix: Travis
 2016-12-23 00:44:16 +01:00
Laurent Destailleur
77c320a092 Fix warning for expense report late 2016-12-22 15:33:43 +01:00
Raphaël Doursenaud
590fcf8399 NEW: Export max payment date with supplier invoices 2016-12-20 18:32:57 +01:00
Laurent Destailleur
3c79f3acb5 Minor fixes or code comment 2016-12-20 12:06:26 +01:00
aspangaro
9901aaa9fe Try to correct travis public underscore problem 2016-12-19 06:34:17 +01:00