Laurent Destailleur
|
366bd64c4f
|
Fix: When number reach 9999 with default numbering module, next number
will be 10000 instead of 0000 and error.
|
2014-05-21 19:44:53 +02:00 |
|
Laurent Destailleur
|
544bd27700
|
Merge pull request #1611 from guerinaxel/patch-3
Correcting log use for commonobject.class.php
|
2014-05-19 16:12:20 +02:00 |
|
Laurent Destailleur
|
ff46adf284
|
Merge pull request #1607 from GPCsolutions/3.6b-review
3.6b review
|
2014-05-19 16:07:49 +02:00 |
|
guerinaxel
|
1dbcd215b8
|
Correcting log use for commonobject.class.php
Correcting dol_syslog use which had 3 parameters instead of 2.
|
2014-05-19 15:54:43 +02:00 |
|
Laurent Destailleur
|
e09cc127fd
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2014-05-19 15:10:46 +02:00 |
|
Raphaël Doursenaud
|
00162cc93d
|
Members: fixed typo
|
2014-05-19 14:38:26 +02:00 |
|
Raphaël Doursenaud
|
c83a0309b1
|
Barcode: fixed wrong menu
|
2014-05-19 14:38:26 +02:00 |
|
Raphaël Doursenaud
|
13cb2e478f
|
Contracts module configuration: missing translation string
|
2014-05-19 14:37:30 +02:00 |
|
Laurent Destailleur
|
b7f55ea99c
|
Merge remote-tracking branch 'origin/3.5' into develop
Conflicts:
htdocs/compta/facture.php
htdocs/core/modules/modAgenda.class.php
htdocs/core/modules/modProduct.class.php
htdocs/fourn/commande/liste.php
|
2014-05-18 11:52:52 +02:00 |
|
Laurent Destailleur
|
00dd7db75e
|
Fix: Miscellaneous fixes into emailing target selectors (missing field
name, missing translation, sql syntax error, missing fiels other)
|
2014-05-17 19:43:22 +02:00 |
|
Laurent Destailleur
|
eec5d6d313
|
Fix: Error management of mass email feature
|
2014-05-17 19:02:47 +02:00 |
|
Laurent Destailleur
|
f7d1e93136
|
Move module to status development
|
2014-05-14 12:27:09 +02:00 |
|
Laurent Destailleur
|
15796ec592
|
Fix: checkstyle errors
|
2014-05-14 12:19:45 +02:00 |
|
Laurent Destailleur
|
0027dc30f5
|
Fix: Modules into core should never, by definition, activate hooks
(hooks are architecture solution for external module)
|
2014-05-14 12:14:18 +02:00 |
|
Laurent Destailleur
|
b3b7da8f08
|
Merge pull request #1595 from FHenry/develop
Add showempty into combobox
|
2014-05-14 11:46:35 +02:00 |
|
Laurent Destailleur
|
4a347236ee
|
Merge pull request #1594 from atm-alexis/develop
Add detailled view in supplier order as in customer order
|
2014-05-14 11:40:49 +02:00 |
|
Laurent Destailleur
|
757d92a318
|
Merge pull request #1589 from aternatik/resource_core
Core integration of resource module
|
2014-05-14 11:25:25 +02:00 |
|
Florian HENRY
|
1f1a9e46fd
|
Fix warning
|
2014-05-13 19:12:14 +02:00 |
|
Florian HENRY
|
a421d9f60f
|
Fix notice pgsql method
|
2014-05-13 18:54:57 +02:00 |
|
Florian HENRY
|
8274b49fc1
|
Avoid notice during PGSQL installation
$unescapeslashquot
|
2014-05-13 18:50:35 +02:00 |
|
Laurent Destailleur
|
f621f7eb32
|
Fix: The rounding mode is now forced when provided explicitly and no
more by default (we keep data intact when no mode provided).
|
2014-05-13 13:22:29 +02:00 |
|
Florian HENRY
|
b6f091926f
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2014-05-13 11:40:39 +02:00 |
|
Florian HENRY
|
d2e2dabf26
|
Add showempty into combobox
|
2014-05-13 11:40:19 +02:00 |
|
Laurent Destailleur
|
f918ae7e4f
|
Decrease log level for disabled trigger
|
2014-05-13 10:36:01 +02:00 |
|
Laurent Destailleur
|
69eaefc459
|
Fix: The way we tested if a ref/id already exists was wrong. Introduce a
common static method for this. Removed verifNumRef method.
Fix: Add missing logs
|
2014-05-13 10:12:45 +02:00 |
|
Laurent Destailleur
|
18848eaf74
|
Clean forms
|
2014-05-12 13:25:36 +02:00 |
|
Laurent Destailleur
|
5fa05ee29d
|
Start to clean code of templates to input lines
|
2014-05-12 12:53:10 +02:00 |
|
Alexis Algoud
|
197ff1a653
|
Add detailled view in supplier order as in customer order
|
2014-05-12 12:10:53 +02:00 |
|
Laurent Destailleur
|
64f8dcf131
|
Fix: Bad syntax of vars
|
2014-05-12 12:10:52 +02:00 |
|
Laurent Destailleur
|
5f0c4dbe48
|
Fix: TCPDF error file not found in member card generation
|
2014-05-12 10:07:57 +02:00 |
|
Laurent Destailleur
|
bb4eed0a1e
|
Merge pull request #1591 from defrance69/patch-9
Update commonobject.class.php
|
2014-05-12 01:56:39 +02:00 |
|
Laurent Destailleur
|
6b1bdf9913
|
Merge pull request #1587 from aternatik/odt_thirdpartycontact
Fix : bad call of extrafields into contact substitution
|
2014-05-12 01:53:41 +02:00 |
|
BENKE Charles
|
8c8c641411
|
Update commonobject.class.php
$objecttype == 'order_supplier' already tested on the previous else if
|
2014-05-11 23:19:18 +02:00 |
|
Laurent Destailleur
|
8428caf8fb
|
List cleaner
|
2014-05-11 21:59:35 +02:00 |
|
Laurent Destailleur
|
d4534f4a0b
|
Fix: [ bug #1384 ] Wrong name for import products and product prices
|
2014-05-11 17:52:16 +02:00 |
|
Marcos García de La Fuente
|
7b05944530
|
Corrected strings not translated and typos in English language
|
2014-05-11 13:14:45 +02:00 |
|
jfefe
|
04161084cf
|
Fix : missing method to delete linked resource
|
2014-05-11 12:26:57 +02:00 |
|
jfefe
|
45aa1b9136
|
Use hook for resource card
|
2014-05-11 12:11:58 +02:00 |
|
jfefe
|
12aafd219d
|
Fix : update linked resource
|
2014-05-11 10:19:38 +02:00 |
|
jfefe
|
901c083ce6
|
Fix : bad link to list into resource menu
|
2014-05-11 00:26:54 +02:00 |
|
jfefe
|
225c7ae07b
|
New : link resource with any element
With tpl system, external modules can declare resource with hook getElementResources
|
2014-05-10 22:07:54 +02:00 |
|
Jean-François Ferry
|
b3f7e9f99b
|
Fix : bad usage of this
|
2014-05-10 22:07:54 +02:00 |
|
Jean-François Ferry
|
e4962e9efd
|
Add resource card
|
2014-05-10 22:07:13 +02:00 |
|
Jean-François Ferry
|
6a9bf009f2
|
Clean code
|
2014-05-10 22:07:13 +02:00 |
|
Jean-François Ferry
|
c5e02edfa8
|
Add submenu for adding resource
|
2014-05-10 22:06:23 +02:00 |
|
Jean-François Ferry
|
1caffcffaf
|
Add new perm to link resource to an element
|
2014-05-10 22:06:23 +02:00 |
|
Jean-François Ferry
|
c04812cd15
|
Fix: bad lang file
|
2014-05-10 22:06:22 +02:00 |
|
Jean-François Ferry
|
fdb50ab116
|
Move generic function from commonobject.class to functions2.lib.php (work on resource module)
|
2014-05-10 22:06:22 +02:00 |
|
Jean-François Ferry
|
e76ce87547
|
Remove unused css
|
2014-05-10 22:03:05 +02:00 |
|
Jean-François Ferry
|
6e24004e82
|
Remove resource module config page
|
2014-05-10 22:03:05 +02:00 |
|
Jean-François Ferry
|
bb58bed930
|
In commonoobject add method for adding resource to an element
|
2014-05-10 22:03:05 +02:00 |
|
Jean-François Ferry
|
e63f8b87c1
|
Mark resource module as experimental / need Dolibarr 3.5
|
2014-05-10 22:03:05 +02:00 |
|
Jean-François Ferry
|
71c44d82ab
|
Move resource module functions into commonobject :
- new method to get an array with object properties
- new method to fetch an object only with id and element_type
|
2014-05-10 22:03:05 +02:00 |
|
Jean-François Ferry
|
d9c567ca3d
|
Prepare structure for upstream merge
|
2014-05-10 22:03:05 +02:00 |
|
Laurent Destailleur
|
3776f7b146
|
Fix: margin calculation from % when we enter a free product.
|
2014-05-10 20:10:59 +02:00 |
|
Laurent Destailleur
|
2bac66fd52
|
Merge remote-tracking branch 'origin/3.5' into develop
|
2014-05-10 19:53:06 +02:00 |
|
Laurent Destailleur
|
7bb24969d8
|
Fix: [ bug #1372 ] Margin calculation does not work in proposals
|
2014-05-10 19:52:24 +02:00 |
|
Laurent Destailleur
|
12055aa44a
|
I did a better fix to have no more dependencies between modules.
|
2014-05-10 19:04:33 +02:00 |
|
Laurent Destailleur
|
c20a5d7e18
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2014-05-10 19:02:55 +02:00 |
|
Laurent Destailleur
|
f95c87f1d6
|
Fix: [ bug #1374 ] Salaries module requires "Special costs" module to
work but it does not enable it
|
2014-05-10 18:57:04 +02:00 |
|
jfefe
|
31044f1f72
|
Fix : bad call of extrafields into contact substitution (works with socpeople)
|
2014-05-10 18:51:54 +02:00 |
|
Juanjo Menent
|
4e53b57313
|
Fix: [ bug #1374 ] Salaries module requires "Special costs" module to
work but it does not enable it
|
2014-05-10 17:54:13 +02:00 |
|
Laurent Destailleur
|
1724fd2f89
|
Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5
|
2014-05-10 16:44:12 +02:00 |
|
Laurent Destailleur
|
4e41b721fb
|
Fix: Nb of notes and doc not visible onto tasks.
|
2014-05-10 16:43:47 +02:00 |
|
Laurent Destailleur
|
f855709cf4
|
Merge pull request #1585 from FHenry/3.5
"or" into if instead of ||
|
2014-05-10 15:44:25 +02:00 |
|
Laurent Destailleur
|
a627dd9ae8
|
Fix: Duplicate line when project has no tasks.
|
2014-05-09 17:14:40 +02:00 |
|
Florian HENRY
|
2aa2f896c6
|
Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5
|
2014-05-09 13:28:45 +02:00 |
|
Florian HENRY
|
02e0fac79f
|
"or" into if instead of ||
|
2014-05-09 13:28:29 +02:00 |
|
Laurent Destailleur
|
7bfbc4cbf3
|
Merge remote-tracking branch 'origin/3.5' into develop
Conflicts:
htdocs/core/modules/modExpedition.class.php
htdocs/projet/class/project.class.php
|
2014-05-07 19:30:19 +02:00 |
|
Laurent Destailleur
|
4bf86508a5
|
Merge pull request #1583 from FHenry/3.5
Fix error return project deletion
|
2014-05-07 19:25:02 +02:00 |
|
Laurent Destailleur
|
ef2a8a0b09
|
Merge pull request #1582 from marcosgdf/changelog
Changelog
|
2014-05-07 19:18:41 +02:00 |
|
Laurent Destailleur
|
16b3ec8923
|
Fix: concat of string must use dol_concat.
|
2014-05-07 19:06:47 +02:00 |
|
Laurent Destailleur
|
1bc3558307
|
Fix: Better html detection
|
2014-05-07 19:06:15 +02:00 |
|
Florian HENRY
|
0e2497e710
|
[ bug #1377 ] Warning: get_class() called without object from outside a
class
|
2014-05-07 18:19:46 +02:00 |
|
Florian HENRY
|
395e09d64d
|
fix warning message into function2.lib.php
|
2014-05-07 17:25:50 +02:00 |
|
Laurent Destailleur
|
40577ab445
|
New: Can enter holiday for someone else if user has permission for.
|
2014-05-07 15:03:05 +02:00 |
|
Laurent Destailleur
|
9add45aea3
|
Qual: Mutualize code.
|
2014-05-07 13:22:02 +02:00 |
|
Laurent Destailleur
|
845f764f93
|
Increase default size of image
|
2014-05-07 12:21:14 +02:00 |
|
Marcos García de La Fuente
|
8681079fa7
|
Fixed CR
|
2014-05-07 10:42:13 +02:00 |
|
Laurent Destailleur
|
182dd774b6
|
Fix: phpunit regression
|
2014-05-07 09:54:36 +02:00 |
|
Laurent Destailleur
|
95b5094e94
|
Fix: phpunit regression
|
2014-05-07 09:33:56 +02:00 |
|
Laurent Destailleur
|
9f795331f5
|
Merge remote-tracking branch 'origin/3.5' into develop
Conflicts:
ChangeLog
build/debian/changelog
build/doxygen/dolibarr-doxygen.doxyfile
build/exe/doliwamp/doliwamp.iss
build/perl/virtualmin/dolibarr.pl
build/rpm/dolibarr_fedora.spec
build/rpm/dolibarr_generic.spec
build/rpm/dolibarr_mandriva.spec
build/rpm/dolibarr_opensuse.spec
htdocs/compta/paiement_charge.php
htdocs/compta/sociales/charges.php
htdocs/core/db/mysql.class.php
htdocs/filefunc.inc.php
htdocs/societe/class/societe.class.php
|
2014-05-06 23:58:17 +02:00 |
|
Laurent Destailleur
|
fe43d10c79
|
Fix: [ bug #1360 ] note indicator for member tab.
|
2014-05-06 23:42:19 +02:00 |
|
Laurent Destailleur
|
3abede630b
|
Fix: [ bug #1365 ] ODT template tag {company_note} does not get
replaced.
|
2014-05-06 23:36:01 +02:00 |
|
Laurent Destailleur
|
e214cdf231
|
Fix: [ bug #1365 ] ODT template tag {company_note} does not get
replaced.
|
2014-05-06 23:35:09 +02:00 |
|
Laurent Destailleur
|
99dc3598de
|
Fix: [ bug #1364 ] Duplicate Id on permission
|
2014-05-06 23:27:44 +02:00 |
|
Laurent Destailleur
|
460b5296ba
|
Fix: [ bug #1353 ] Email notifications, wrong URL
|
2014-05-06 22:21:34 +02:00 |
|
Laurent Destailleur
|
7a452519e7
|
Try to fix [ bug #1363 ] Unable to update from 3.5.1 to 3.5.2
|
2014-05-06 22:00:54 +02:00 |
|
Laurent Destailleur
|
01001592e6
|
Finished task to merge form of free product and predefined product.
|
2014-05-06 18:31:39 +02:00 |
|
Laurent Destailleur
|
647d431857
|
Fix: contact of delivery of order not visible into typhon pdf.
|
2014-05-06 13:43:41 +02:00 |
|
Laurent Destailleur
|
959b104b78
|
Fix: the pdf template name for typhon as not correctly set when enabling
module.
|
2014-05-06 13:31:30 +02:00 |
|
Laurent Destailleur
|
c4291c228e
|
Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5
|
2014-05-06 13:16:06 +02:00 |
|
Laurent Destailleur
|
948e0bf753
|
Fix: When on delivery receipt, ref of shipment was not visible. Also
some tabs were missing.
Fix: After deletion of delivery receipt, we must go back to shipment of
delivery receipt.
|
2014-05-06 13:15:37 +02:00 |
|
philippe
|
a04cd99090
|
fix : no room when number of pages sup than 9
|
2014-05-05 19:03:25 +02:00 |
|
Laurent Destailleur
|
dca53accaf
|
Fix: translation
|
2014-05-05 18:30:07 +02:00 |
|
Laurent Destailleur
|
131f133e07
|
New: Merge free product and predefined product area to enter new
product (Supplier orders now use same template than customer
orders/proposal/invoices).
|
2014-05-05 17:59:43 +02:00 |
|
Laurent Destailleur
|
d224128c46
|
New: Merge free product and predefined product area to enter new
product.
|
2014-05-05 14:30:08 +02:00 |
|
Laurent Destailleur
|
cc8dcacbc9
|
New: DolEditor can accepts percent instead of nb of cols for textarea
mode.
|
2014-05-05 13:41:25 +02:00 |
|
Laurent Destailleur
|
63100c9c06
|
Properties "civilite_id" were renamed into "civility_id".
|
2014-05-05 00:23:09 +02:00 |
|
Laurent Destailleur
|
bcdf3e8a51
|
New: The combo list of juridical status is now sorted
|
2014-05-04 23:46:36 +02:00 |
|
Laurent Destailleur
|
c2c0a9b4bb
|
Merge pull request #1568 from GPCsolutions/closingtagremoval
Qual: Remove the closing PHP tag
|
2014-05-04 18:08:37 +02:00 |
|
Laurent Destailleur
|
5b5a894aaf
|
Merge pull request #1567 from marcosgdf/doc
Improved documentation of Societe and started type hinting variables
|
2014-05-04 18:07:08 +02:00 |
|
Laurent Destailleur
|
697f68c9a9
|
Merge branch '3.5' of github.com:FHenry/dolibarr into FHenry-3.5
Conflicts:
ChangeLog
|
2014-05-04 17:43:47 +02:00 |
|
Laurent Destailleur
|
5a9cca62a6
|
Clean code
|
2014-05-04 17:38:26 +02:00 |
|
Laurent Destailleur
|
03f9f0bada
|
Fix: Pb of records not correctly cleaned when module marge is
uninstalled (conflict between 'margin' and 'margins').
|
2014-05-03 20:21:35 +02:00 |
|
Raphaël Doursenaud
|
f8f502d013
|
Removed closing php tag
http://php.net/manual/en/language.basic-syntax.phptags.php
|
2014-05-03 18:18:44 +02:00 |
|
Marcos García de La Fuente
|
105d892d27
|
Corrected Translate::getLabelFromKey doc
|
2014-05-03 13:42:34 +02:00 |
|
Marcos García de La Fuente
|
abfb8b2317
|
Corrected Database.interface doc
|
2014-05-03 13:27:24 +02:00 |
|
Marcos García de La Fuente
|
0d129617cb
|
Corrected Database.interface::fetch_object doc
|
2014-05-03 13:24:42 +02:00 |
|
Laurent Destailleur
|
e1d30837e9
|
Try to remove a warning
|
2014-05-03 03:10:58 +02:00 |
|
Laurent Destailleur
|
50c10d3d1e
|
Fix: Can disable features with PHPEXCEL (no DLSF compatible).
Fix: Can disable features with CKEDITOR.
|
2014-05-03 02:20:26 +02:00 |
|
Laurent Destailleur
|
43253d877a
|
Fix: Can disable features with PHPEXCEL (no DLSF compatible).
Fix: Can disable features with CKEDITOR.
|
2014-05-03 02:15:33 +02:00 |
|
Laurent Destailleur
|
d97c45a9b8
|
Add version of phpunit into travis script.
Fix: strict mode.
|
2014-05-01 19:17:45 +02:00 |
|
Florian HENRY
|
2637305065
|
same
|
2014-05-01 18:15:32 +02:00 |
|
Florian HENRY
|
a4126fae66
|
[ bug #1341 ] Lastname not added by file or direct input in mass
e-mailing
|
2014-05-01 18:13:01 +02:00 |
|
Laurent Destailleur
|
7bb23086b8
|
Fix: Strict mode
|
2014-05-01 17:06:14 +02:00 |
|
Laurent Destailleur
|
6a53a4e0d2
|
Fix: doxygen
|
2014-05-01 16:43:40 +02:00 |
|
Laurent Destailleur
|
21716a0c7c
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2014-05-01 16:27:16 +02:00 |
|
Laurent Destailleur
|
b56f59b313
|
Perf: Avoid to isntantiate object 'form' into 'subform' classes when
already available.
Qual: Better information into xdebug page.
|
2014-05-01 16:26:57 +02:00 |
|
Laurent Destailleur
|
ee6cac8294
|
Doc
|
2014-05-01 16:11:29 +02:00 |
|
Laurent Destailleur
|
0219d53f69
|
Merge branch 'odt_thirdpartycontact' of github.com:aternatik/dolibarr into aternatik-odt_thirdpartycontact
|
2014-05-01 11:22:32 +02:00 |
|
Laurent Destailleur
|
6a200105b9
|
Merge branch 'develop' of github.com:aspangaro/dolibarr into
aspangaro-develop
Conflicts:
ChangeLog
|
2014-05-01 11:16:42 +02:00 |
|
Laurent Destailleur
|
3719fc1234
|
Merge pull request #1557 from defrance69/develop
export extrafields on bill & set real ref bordereau number
|
2014-05-01 11:09:16 +02:00 |
|
Laurent Destailleur
|
569d4cfd41
|
Merge pull request #1556 from FHenry/develop
Enable option clone target emailing
|
2014-05-01 11:08:05 +02:00 |
|
aspangaro
|
501b7209de
|
Move module trips into family "hr"
|
2014-05-01 04:57:49 +02:00 |
|
jfefe
|
fd45bb16bd
|
Fix : make ODT substitution for company after contacts
|
2014-04-30 19:18:51 +02:00 |
|
Laurent Destailleur
|
a574aeff96
|
Qual: Removed warning
|
2014-04-30 15:30:20 +02:00 |
|
Laurent Destailleur
|
b11bd00e9a
|
Fix: Removed blank lines at beginning of email when contact not defined
|
2014-04-30 15:17:39 +02:00 |
|
Laurent Destailleur
|
880f77b7e1
|
Fix: Preview feature
|
2014-04-30 13:50:25 +02:00 |
|
Jean-François Ferry
|
00cd616f4c
|
Add informations about contacts of thirdparty into ODT
|
2014-04-30 10:36:23 +02:00 |
|
Laurent Destailleur
|
19d71ffb38
|
Prepare fix to hide images generated by "preview" feature.
|
2014-04-29 21:14:55 +02:00 |
|
BENKE Charles
|
468f6fd5fb
|
Update modFournisseur.class.php
Add extrafields export feature on bill
|
2014-04-29 11:57:51 +02:00 |
|
BENKE Charles
|
b283ed73d1
|
Update modFacture.class.php
add export extrafields feature
|
2014-04-29 11:53:04 +02:00 |
|
Florian HENRY
|
7a46bdfc55
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
Conflicts:
ChangeLog
|
2014-04-28 17:20:40 +02:00 |
|
Florian HENRY
|
dddbc37d35
|
Enable option clone target emailing
|
2014-04-28 17:18:11 +02:00 |
|
Laurent Destailleur
|
4cb671f4db
|
Qual: Clean deprecated code.
|
2014-04-28 11:55:08 +02:00 |
|
Laurent Destailleur
|
4a23a8a789
|
Merge branch 'category_translate' of github.com:aternatik/dolibarr into
aternatik-category_translate
Conflicts:
ChangeLog
|
2014-04-28 02:39:56 +02:00 |
|
Laurent Destailleur
|
e5c5b15ecc
|
Qual: Start to clean module ECM (Code is to complex). Prepare for
replacement with another tool.
New: A module can add its own ECM view.
New: A module can disable a standard ECM view.
|
2014-04-28 01:46:11 +02:00 |
|
Laurent Destailleur
|
8c5bc11def
|
Qual: Better error message for LDAP connection
|
2014-04-27 14:16:29 +02:00 |
|
Laurent Destailleur
|
8c7ff91341
|
Fix: Removed html5 warnings
|
2014-04-27 01:51:50 +02:00 |
|
Laurent Destailleur
|
8beaf30e88
|
Qual: Removed useless use of js
|
2014-04-27 01:51:31 +02:00 |
|
Laurent Destailleur
|
5f1e690039
|
New: Show invoice ref in boxes for supplier invoices.
|
2014-04-26 23:15:45 +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
|
4fa472518e
|
Fix: doxygen
|
2014-04-26 22:23:46 +02:00 |
|
Laurent Destailleur
|
bd8cdd337a
|
Fix: Option MAIN_INVERT_SENDER_RECIPIENT broken with typhon template.
|
2014-04-26 22:17:11 +02:00 |
|
Laurent Destailleur
|
537ada96a8
|
Fix: [ bug #1354 ] Tasks disapear in same sub-task
Conflicts:
htdocs/install/mysql/migration/repair.sql
htdocs/projet/class/project.class.php
|
2014-04-26 21:47:15 +02:00 |
|
Laurent Destailleur
|
af2cf0b66f
|
Fix: [ bug #1354 ] Tasks disapear in same sub-task
|
2014-04-26 21:36:58 +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
|
4ade14b841
|
Qual: Removed code we should not have.
|
2014-04-26 16:15:35 +02:00 |
|
Laurent Destailleur
|
71ca269c71
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
Conflicts:
htdocs/core/menus/standard/auguria.lib.php
htdocs/core/menus/standard/eldy.lib.php
|
2014-04-25 20:29:29 +02:00 |
|
Laurent Destailleur
|
9a320cc50f
|
Removed a function we should not have.
|
2014-04-25 20:18:26 +02:00 |
|
Laurent Destailleur
|
196cf53dbd
|
Fix: Pb of return values
|
2014-04-25 20:11:38 +02:00 |
|
Laurent Destailleur
|
b117ea83be
|
Fix: missing trans
Fix: detection of html content
|
2014-04-25 16:45:14 +02:00 |
|
jfefe
|
d256799abf
|
Work on adding catgory translation
|
2014-04-25 15:17:12 +02:00 |
|
jfefe
|
afaf5698a5
|
Fix : bad link to categorie admin page
|
2014-04-25 14:25:49 +02:00 |
|
Laurent Destailleur
|
889ed4a49c
|
Fix: div was opened and not close or the oposite.
|
2014-04-24 01:26:28 +02:00 |
|
Laurent Destailleur
|
03d73bce9c
|
Merge pull request #1550 from GPCsolutions/staticanalysis
Various fixes to defects found using statical analysis tooling
|
2014-04-23 21:20:39 +02:00 |
|
Laurent Destailleur
|
6c56302fd2
|
Merge pull request #1547 from GPCsolutions/jsinjection
Qual: Prevent potential JS injection
|
2014-04-23 21:14:22 +02:00 |
|
Laurent Destailleur
|
5e2c360d38
|
Merge pull request #1546 from GPCsolutions/linkfix
Fix undeclared variable
|
2014-04-23 21:13:06 +02:00 |
|
Laurent Destailleur
|
8d6e80d016
|
Merge pull request #1545 from GPCsolutions/dolidb
Dolidb
|
2014-04-23 21:12:43 +02:00 |
|
Laurent Destailleur
|
82d57c20cc
|
Merge pull request #1542 from FHenry/develop
add filter to effectif select
|
2014-04-23 21:10:07 +02:00 |
|
Raphaël Doursenaud
|
11ef3ef34e
|
Qual: Missing variable declaration
|
2014-04-23 18:24:11 +02:00 |
|
Raphaël Doursenaud
|
a57b7d4ed2
|
Qual: Derived missing variable from a known one
|
2014-04-23 18:24:10 +02:00 |
|
Raphaël Doursenaud
|
7852020b3d
|
Qual: Missing global declaration
|
2014-04-23 18:24:10 +02:00 |
|
Raphaël Doursenaud
|
490b45ea7e
|
Qual: Wrong type in method documentation
|
2014-04-23 18:24:10 +02:00 |
|
Raphaël Doursenaud
|
e3fa0332f4
|
Qual: Missing global declaration
|
2014-04-23 18:24:10 +02:00 |
|
Raphaël Doursenaud
|
167457562e
|
Qual: Wrong variable name
|
2014-04-23 18:24:10 +02:00 |
|
Raphaël Doursenaud
|
8f215205fa
|
Qual: Wrong type in method documentation
|
2014-04-23 18:24:10 +02:00 |
|
Raphaël Doursenaud
|
79e2bf4737
|
Qual: Missing global declaration
|
2014-04-23 18:24:10 +02:00 |
|
Raphaël Doursenaud
|
c4569b10d0
|
Qual: Wrong variable name
|
2014-04-23 18:24:09 +02:00 |
|
Raphaël Doursenaud
|
10a0994241
|
Qual: Wrong type in method documentation
|
2014-04-23 18:24:09 +02:00 |
|
Raphaël Doursenaud
|
370996d5c4
|
Qual: Wrong type in method documentation
|
2014-04-23 18:24:09 +02:00 |
|
Raphaël Doursenaud
|
32f5ecfaa3
|
Qual: Wrong type in method documentation
|
2014-04-23 18:24:09 +02:00 |
|
Raphaël Doursenaud
|
6366a66efd
|
Qual: Wrong type in method documentation
|
2014-04-23 18:24:09 +02:00 |
|
Raphaël Doursenaud
|
9bb454b242
|
Qual: Wrong variable name
|
2014-04-23 18:24:09 +02:00 |
|
Raphaël Doursenaud
|
953e196a2c
|
Qual: Missing variable declaration
|
2014-04-23 18:24:09 +02:00 |
|
Raphaël Doursenaud
|
f357d3c5ab
|
Qual: Missing global declaration
|
2014-04-23 18:24:09 +02:00 |
|
Raphaël Doursenaud
|
aa1ff28158
|
Qual: Missing global declaration
|
2014-04-23 18:24:08 +02:00 |
|
Raphaël Doursenaud
|
22263dc2c1
|
Qual: Missing global declaration
|
2014-04-23 18:24:08 +02:00 |
|
Raphaël Doursenaud
|
e738a294e8
|
Qual: Wrong variable name
|
2014-04-23 18:24:08 +02:00 |
|
Raphaël Doursenaud
|
1d52f6d6c2
|
Qual: Fixed typo
|
2014-04-23 18:24:08 +02:00 |
|
Raphaël Doursenaud
|
e561cc87f7
|
Qual: Wrong variable name
|
2014-04-23 18:24:08 +02:00 |
|
Raphaël Doursenaud
|
2abbc8845f
|
Qual: Missing global declaration
|
2014-04-23 18:24:08 +02:00 |
|
Raphaël Doursenaud
|
0d92abc037
|
Qual: Missing global declaration
|
2014-04-23 18:24:08 +02:00 |
|
Raphaël Doursenaud
|
2cfe27b434
|
Qual: Wrong type in method documentation
|
2014-04-23 18:24:07 +02:00 |
|
Raphaël Doursenaud
|
6174099827
|
Qual: Wrong type in method documentation
|
2014-04-23 18:24:07 +02:00 |
|
Raphaël Doursenaud
|
858d1dc8d0
|
Qual: Missing variable declaration
|
2014-04-23 18:24:07 +02:00 |
|
Raphaël Doursenaud
|
db82a6f0e6
|
Qual: Missing global declaration
|
2014-04-23 18:24:07 +02:00 |
|
Raphaël Doursenaud
|
988e7a137e
|
Qual: Missing global declaration
|
2014-04-23 18:24:07 +02:00 |
|
Raphaël Doursenaud
|
f476bee0c7
|
Qual: Missing variable declaration
|
2014-04-23 18:24:07 +02:00 |
|
Raphaël Doursenaud
|
20983b4807
|
Qual: Removed unused variable
|
2014-04-23 18:24:07 +02:00 |
|
Raphaël Doursenaud
|
7497a72b1d
|
Qual: Removed dead code
|
2014-04-23 18:24:07 +02:00 |
|
Raphaël Doursenaud
|
4f3a28e7ed
|
Qual: Removed unused variable
|
2014-04-23 18:24:06 +02:00 |
|
Raphaël Doursenaud
|
5d74a5a852
|
Qual: Wrong variable name
|
2014-04-23 18:24:06 +02:00 |
|
Raphaël Doursenaud
|
70606d04ea
|
Qual: Missing global declaration
|
2014-04-23 18:24:06 +02:00 |
|
Raphaël Doursenaud
|
e7d9423812
|
Qual: Wrong variable name
|
2014-04-23 18:24:06 +02:00 |
|
Raphaël Doursenaud
|
126d2522fd
|
Qual: Missing global declaration
|
2014-04-23 18:24:06 +02:00 |
|
Raphaël Doursenaud
|
aacd657972
|
Qual: Wrong variable name
|
2014-04-23 18:24:06 +02:00 |
|
Raphaël Doursenaud
|
96e12e75bb
|
Qual: Missing variable declaration
|
2014-04-23 18:24:06 +02:00 |
|
Raphaël Doursenaud
|
9c5db27a70
|
Qual: Wrong type in method documentation
|
2014-04-23 18:24:05 +02:00 |
|