Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
47,690 Commits 36 Branches 189 Tags
05a7ab158b51a05dbb38ac7b02abf0d2c1df9891
Commit Graph

151 Commits

Author SHA1 Message Date
Juanjo Menent
1d3bcc1d81 Insert option to use old system storage photos only if the first 
installation was done with a version < 3.7.0

Conflicts:
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
 2015-05-16 16:19:51 +02:00
Laurent Destailleur
53bf90a3e2 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	ChangeLog
 2015-04-28 21:54:13 +02:00
Juanjo Menent
ebe1f4a74d -Activate const PRODUCT_USE_OLD_PATH_FOR_PHOTOS by default for old 
instances
-Update changelog for 3.7.1

Conflicts:
	ChangeLog
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
 2015-04-27 20:31:12 +02:00
Juanjo Menent
93024830f5 -Activate const PRODUCT_USE_OLD_PATH_FOR_PHOTOS by default for old 
instances
-Update changelog for 3.7.1
 2015-04-27 20:22:03 +02:00
Laurent Destailleur
414404e854 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/core/class/commonobject.class.php
 2015-04-26 16:30:33 +02:00
Laurent Destailleur
d47b9a759a FIX migration error 2015-04-24 00:33:02 +02:00
Maxime Kohlhaas
7223495ac2 Fix : date_delivery was not a datetime 2015-04-18 04:21:16 +02:00
Maxime Kohlhaas
07fd6a3ae7 Fix : delivery date was not a datetime 2015-04-18 04:18:40 +02:00
Laurent Destailleur
ae103e34b8 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	build/debian/changelog
	htdocs/compta/facture.php
	htdocs/core/lib/price.lib.php
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
	htdocs/opensurvey/public/studs.php
	htdocs/projet/element.php
 2015-04-13 13:08:46 +02:00
Laurent Destailleur
74a4bca42c Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-04-11 22:52:27 +02:00
Laurent Destailleur
6889162d7a Fix: management of vat type 2, 4 and 6 is now ok. 
Works for canada and ivory cost.
 2015-04-11 22:51:53 +02:00
Laurent Destailleur
8e9c1c4747 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/commande/card.php
	htdocs/commande/class/commande.class.php
	htdocs/commande/list.php
	htdocs/core/class/notify.class.php
	htdocs/core/login/functions_dolibarr.php
	htdocs/exports/export.php
	htdocs/langs/en_US/admin.lang
 2015-04-01 16:33:39 +02:00
Laurent Destailleur
16a620f926 Fix: Deadlock situation (when order were canceled, no way to make 
nothing on it)
Fix: Don't know how I forgot this events into trigger system.
 2015-04-01 16:07:22 +02:00
Laurent Destailleur
92af226fff Fix Not into official 3.7 but must be into migration for 3.7 when 
migration is done by 3.8 code
 2015-03-20 15:19:42 +01:00
Laurent Destailleur
fa2e57eaa3 pcpcs 2015-03-04 01:10:23 +01:00
Laurent Destailleur
7baaf18ad1 Fix can be null 2015-02-28 18:44:06 +01:00
Laurent Destailleur
9842e816d0 Fix bad sql type 
Fix no input outside tr-td
 2015-02-24 11:24:15 +01:00
Laurent Destailleur
d7dcf28c61 Merge branch '3.7' of https://github.com/atm-gauthier/dolibarr into 
atm-gauthier-3.7

Conflicts:
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
 2015-02-18 23:15:40 +01:00
Laurent Destailleur
ad67fe50a3 Correct management when delivery date is universal time format. 2015-02-17 17:21:41 +01:00
Laurent Destailleur
118ae7e8f8 Backport fix done into dev. 2015-02-16 17:55:53 +01:00
Gauthier
be56f76743 FIX : Display error on dispatched quantity when we have several times same product in a supplier order 2015-02-12 12:56:21 +01:00
Juanjo Menent
2fd38f310a Increase size of localtaxX (10 is not enough in some cases) 2015-02-02 21:06:21 +01:00
aspangaro
ae11ab12f6 FIXED Accounting module - Align core & module 3.6 2015-01-25 06:54:17 +01:00
Laurent Destailleur
ba49cce47a Fix: The filter into event views on user must be done on assigned 
resource, not only owner.
 2015-01-15 02:06:04 +01:00
Laurent Destailleur
2bf2c8fce7 Restore all requets 2015-01-06 00:34:23 +01:00
Laurent Destailleur
420ebe0be9 Fix: Change order to create fields 2014-12-26 04:04:16 +01:00
Laurent Destailleur
2b4edd9996 Fix: [ bug #1687 ] The ref filter searches on ref and rowid in supplier 
invoices list
 2014-12-23 13:21:40 +01:00
Laurent Destailleur
0459477097 Fix: Miscellaneous fixes for multicompany 2014-12-06 14:41:56 +01:00
Laurent Destailleur
55b7bb532d Fixed: Bad field of default value for fields into predefined/recuring 
invoice tables.
 2014-12-01 23:50:03 +01:00
Laurent Destailleur
31a5a46ffa Merge pull request #2022 from asirinelli/3.7 
Add EIRL in llx_c_forme_juridique
 2014-11-22 16:00:32 +01:00
Laurent Destailleur
dfae42cd4a Merge pull request #2051 from aspangaro/1690 
#1672 VAT accounts by default are lost in migration
 2014-11-22 15:41:58 +01:00
aspangaro
621f2b5c77 #1672 VAT accounts by default are lost in migration 2014-11-18 21:28:12 +01:00
Raphaël Doursenaud
079dbf9fbd Work around bug #1644 2014-11-17 14:59:14 +01:00
Antoine Sirinelli
ec20b38adc Add EIRL in llx_c_forme_juridique 
This a not so new French type of company: Entreprise Individuelle à
Responsabilité Limitée (EIRL).
Migration script also added.
 2014-11-16 23:56:10 +01:00
Laurent Destailleur
10117d045f Fixed #1637 2014-11-16 16:15:31 +01:00
Laurent Destailleur
11eb7de596 Try to clean sql to avoid mysql bug 2014-11-15 14:14:52 +01:00
BENKE Charles
6cee8e1294 Update 3.6.0-3.7.0.sql 
increase fieds size of ref supplier (order and bill)
 2014-11-13 11:24:45 +01:00
Laurent Destailleur
7177c04378 Minor css enhancement 2014-11-11 20:45:30 +01:00
Laurent Destailleur
9ae03f533d Test 2014-11-08 00:35:28 +01:00
Laurent Destailleur
7ca2e275df Track travis bug 2014-11-08 00:10:05 +01:00
Laurent Destailleur
633e34da52 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-11-06 13:47:38 +01:00
Laurent Destailleur
b68bfac593 Fix: Usage of migration scripts from command line 2014-11-06 13:46:12 +01:00
Juanjo Menent
6f9d283ddc Fix: Module notifications DB Error "unknown field type" into third tab 
notifications
 2014-11-06 11:20:47 +01:00
Laurent Destailleur
cf6a0df3e4 A lot of fix in missing intervention trigger. Align key to use same name 
to avoid future bugs.
 2014-11-03 17:23:02 +01:00
Laurent Destailleur
155452ba91 Fix: Proposal deadlock situation 
New: Add missing trigger PROPAL_CLASSIFYBILLED.
 2014-11-03 16:20:55 +01:00
Laurent Destailleur
a1a10edc30 Merge pull request #1987 from IonAgorria/soap-client-order 
Added SOAP client for creating a client order in remote webservice
 2014-11-01 21:14:19 +01:00
Ion Agorria
82aa8458bf Added ws url/key to thirdparty SQL table, class and info page 2014-10-31 17:46:11 +01:00
Laurent Destailleur
9c51effe5c Ajout plus d'info dans description audit. 2014-10-31 15:42:35 +01:00
Laurent Destailleur
fb4858a5d3 Update changelog 2014-10-30 18:07:09 +01:00
Laurent Destailleur
38a939771c New: Add template of emails into dictionnary. 2014-10-30 17:16:51 +01:00