Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
74,307 Commits 36 Branches 189 Tags
4495f0a755c52c76456b51a3347ea42f4fc101a1
Commit Graph

272 Commits

Author SHA1 Message Date
Laurent Destailleur
f11fd22809 More accurate message 2015-10-01 22:27:02 +02:00
Laurent Destailleur
9901406634 A paswword can be set on member card but member can't login. Too much 
work to fix this into a stable version, so I just introduce a warning to
explain why and how to solve this.
 2015-10-01 10:15:07 +02:00
Raphaël Doursenaud
e85c510b87 Qual: Fixed translation strings 2015-09-07 19:44:10 +02:00
Laurent Destailleur
2a85fb542a Fix phpcs 
Sync transifex
 2015-08-31 17:22:36 +02:00
Laurent Destailleur
39cbd7629f Fix error message during import 2015-08-27 23:49:25 +02:00
Laurent Destailleur
cbb2d8d800 Fix typo 2015-07-29 16:30:30 +02:00
Laurent Destailleur
a6bac40f0a Fix bad translation 2015-07-29 13:03:52 +02:00
Laurent Destailleur
2f2b0df6f8 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/contact/exportimport.php
	htdocs/contact/info.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.form.class.php
	htdocs/core/modules/DolibarrModules.class.php
	htdocs/core/modules/modSociete.class.php
	htdocs/core/tpl/document_actions_pre_headers.tpl.php
	htdocs/langs/fr_FR/categories.lang
	htdocs/main.inc.php
	htdocs/product/reassort.php
	htdocs/projet/list.php
	htdocs/societe/info.php
 2015-07-19 12:26:31 +02:00
Laurent Destailleur
2bb1945a2f Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/compta/prelevement/class/rejetprelevement.class.php
	htdocs/compta/sociales/class/paymentsocialcontribution.class.php
	htdocs/contact/exportimport.php
	htdocs/contact/ldap.php
	htdocs/contact/perso.php
	htdocs/contact/vcard.php
	htdocs/core/class/commonobject.class.php
	htdocs/product/reassort.php
	htdocs/projet/liste.php
	htdocs/societe/consumption.php
	htdocs/societe/info.php
 2015-07-19 12:04:30 +02:00
Marcos García de La Fuente
e9d1e6265d Fix: [ bug #2696 ] Adding complementary attribute fails if code is numerics 
Close #2696
 2015-07-18 14:25:05 +02:00
Laurent Destailleur
8d77667764 Bad stat report 2015-07-10 10:42:42 +02:00
Laurent Destailleur
d5a4a98c22 FIX #3138 - Too much visible thing when access is denied on public pages 2015-07-04 14:56:43 +02:00
Laurent Destailleur
27cc7ef2b3 Time spent 2015-06-23 10:13:08 +02:00
Francis Appels
28e973331b Fix: update supplier orderline + rm deprecated prop 
- Fix SQL error in update supplier orderline
- Remove deprecated $libelle from product class, $libelle is removed
from code and can not be used anymore, no sense to mark deprecated.
- Add missing translation key
 2015-05-18 18:42:14 +02:00
Laurent Destailleur
56a14da5d4 FIXME that are not bug are replaced with TODO 
Add control on batch movement (lot/serial is mandatory, and control
eatby and sellby are same for each lot/serial)
 2015-04-12 04:01:28 +02:00
Laurent Destailleur
e01e0faeef Can reopen to edit supplier order once ordered 2015-04-09 16:15:52 +02:00
Laurent Destailleur
17fa1ce5b6 Fix #2552 2015-04-08 12:22:52 +02:00
Ion Agorria
2d09d8196f Language additions 2015-03-14 16:51:50 +01:00
Laurent Destailleur
56b5bfd25b NEW: Implement option SUPPLIER_ORDER_USE_DISPATCH_STATUS to add a status 
into each dispathing line of supplier order to "verify" a
reception is ok. Status of order can be set to "total/done" only if line
is verified.
 2015-03-08 02:08:26 +01:00
Laurent Destailleur
562348eb34 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/fourn/commande/dispatch.php
 2015-02-24 15:42:28 +01:00
Laurent Destailleur
74f15680e1 Fix missing fields into import of thirdparties. 
Fix import failed to find type of companny from source file.
Fix import date of creation has wrong check rule.
 2015-02-24 15:40:50 +01:00
Laurent Destailleur
b6947dbe2c Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/core/modules/DolibarrModules.class.php
 2015-02-18 22:04:26 +01:00
Laurent Destailleur
cc1d506614 Miscelaneous debug on barcode features. 2015-02-18 21:01:17 +01:00
Laurent Destailleur
179cbbd187 Maxi debug and enhancement of module batch. 2015-02-11 22:54:06 +01:00
frederic34
173d3aaa90 Translation error messages numbering modules 2015-01-11 11:31:53 +01:00
Ion Agorria
6c37d03f13 Added language entries for dinamic prices 2014-11-29 06:32:33 +01:00
Laurent Destailleur
2b08417b77 Fix: [ bug #1612 ] Adding free product line line with negative qty in 
credit notes, doesn't give error message
 2014-10-27 01:51:33 +01:00
Laurent Destailleur
90d47cffae Better error management and better error message for reporting upload or 
error of images.
 2014-10-18 14:56:06 +02:00
Laurent Destailleur
9666d5e3ae Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/.gitignore
	htdocs/core/lib/functions2.lib.php
	htdocs/install/mysql/migration/repair.sql
	htdocs/langs/en_US/errors.lang
 2014-09-18 10:17:43 +02:00
Juanjo Menent
90edd96646 Fix: Invoices payments may be older than invoices 2014-09-18 10:11:39 +02:00
Laurent Destailleur
b16b1c2ce0 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/core/lib/functions2.lib.php
	htdocs/langs/en_US/errors.lang
	htdocs/product/class/product.class.php
 2014-09-18 10:08:56 +02:00
Laurent Destailleur
015b0d8036 Fix: Bad calculation of total 
Fix: Warning message not translated
 2014-09-18 10:05:37 +02:00
Juanjo Menent
ab83e22a12 Fix: Invoices payments may be older than invoices 2014-09-18 09:57:13 +02:00
Laurent Destailleur
3e9ddbfcd0 Fix: [ bug #1547 ] Untranslated Paiementfourn.class.php error messages 2014-08-17 00:38:09 +02:00
Laurent Destailleur
c9d27383a4 Fix: When option to use optimize display for text borwser and blin 
person is on, box addon was broken.
 2014-07-29 00:50:57 +02:00
Laurent Destailleur
97fce71218 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/core/lib/functions2.lib.php
	htdocs/install/mysql/migration/repair.sql
	htdocs/langs/en_US/errors.lang
	htdocs/product/fiche.php
	htdocs/projet/tasks/task.php
 2014-04-26 22:35:35 +02:00
Laurent Destailleur
6968304641 Fix: [ bug #1352 ] Removing a shipping does not remove the delivery. 2014-04-26 17:27:59 +02:00
Laurent Destailleur
d595b96c8e New: Paypal return for subscription show more information and direct 
link into email.
Qual: Better management of error when creating subscription of member
not linked to a third party.
 2014-04-06 14:22:08 +02:00
Raphaël Doursenaud
e07e86b824 Deduplicated lines of the reference language files 
Used the new deduplicatefilelinesrecursively.sh script
 2014-03-27 12:04:03 +01:00
Laurent Destailleur
480b09f192 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	ChangeLog
	htdocs/comm/propal.php
	htdocs/commande/fiche.php
	htdocs/societe/class/societe.class.php
 2014-02-26 15:49:29 +01:00
Laurent Destailleur
63a2aa3365 Fix: sql error with postgres when creating extrafield with an upper cas 
character. code for new fields must be always lowercase.
 2014-02-25 15:48:13 +01:00
Laurent Destailleur
2e67bbc382 Maxi debug of barcode feature. 
New: Barcode format and mandatory requirement is checked.
New: Start to add new page for barcode init.
 2014-02-19 01:51:19 +01:00
Laurent Destailleur
e5cd32623c Qual: Uniformize code of payment between customer and supplier payments. 
New: Add warning if supplier payment is higher that due amount.
 2014-02-03 18:42:24 +01:00
Laurent Destailleur
23e6709164 Better error message 2014-01-21 12:55:05 +01:00
Marcos García de La Fuente
67077338a0 Improved translation of opensurvey module 2014-01-05 06:37:08 +01:00
Marcos García de La Fuente
dd7be996c2 Improved translation of opensurvey module 2014-01-03 15:27:26 +01:00
Laurent Destailleur
086eb125bf Qual: Removed no more required translation entry UTF8 2013-10-23 10:34:48 +02:00
Laurent Destailleur
61b98275f5 Fix: Error message 2013-10-14 16:01:01 +02:00
Laurent Destailleur
491bd76c1b Work on openif authentication mode 2013-09-18 21:22:24 +02:00
Laurent Destailleur
4f464eb226 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/core/modules/export/export_excel2007.modules.php
	htdocs/langs/en_US/errors.lang
	htdocs/langs/fr_FR/agenda.lang
	htdocs/langs/fr_FR/errors.lang
 2013-08-01 17:42:18 +02:00