2
0
forked from Wavyzz/dolibarr
Commit Graph

1875 Commits

Author SHA1 Message Date
Laurent Destailleur
3f79c00542 Merge branch 'develop' into actioncomm_category 2020-01-15 14:21:06 +01:00
Laurent Destailleur
64564e75ae Add entity into unique key 2020-01-15 13:55:17 +01:00
Laurent Destailleur
ef540c6c72 Merge branch 'develop' into FIX_develop_urls_longer_than_255_chars_get_truncated_in_bookmarks 2020-01-15 13:50:03 +01:00
Laurent Destailleur
5772dce460 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/lib/functions.lib.php
2020-01-15 12:09:21 +01:00
atm-ph
a088c78279 Fix column type to be as llx_facture 2020-01-15 09:52:12 +01:00
Laurent Destailleur
22b6828e09 Merge pull request #12792 from aspangaro/12.0_a5
NEW Accountancy - Add possibility to manage an short alternative label for account - Use to simplify accountancy
2020-01-10 00:23:54 +01:00
Laurent Destailleur
e8e82ca08c Standardize columns 2020-01-09 20:11:03 +01:00
Laurent Destailleur
97f62c68f2 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-08 13:38:03 +01:00
Laurent Destailleur
20c9035837 Debug MRP 2020-01-07 22:17:40 +01:00
Laurent Destailleur
b9e0f8999f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/filefunc.inc.php
2020-01-04 14:03:21 +01:00
Alexandre SPANGARO
c3518426bd NEW Accountancy - Add possibility to manage an short alternative label - use to simplify 2020-01-03 22:05:49 +01:00
Laurent Destailleur
d93de4b931 FIX Import of customer prices per segment was not possible 2020-01-02 20:08:43 +01:00
Frédéric FRANCE
90235d0528 Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-12-31 13:57:40 +01:00
Laurent Destailleur
8838dc38db Merge branch 'develop' into FIX_develop_urls_longer_than_255_chars_get_truncated_in_bookmarks 2019-12-30 22:25:06 +01:00
Laurent Destailleur
ece8390277 Add tables to store translation of all objects (like llx_product_lang) 2019-12-26 13:23:18 +01:00
Laurent Destailleur
4333cf2040 Show the stripe accoutn of a cu_ and a card_ 2019-12-24 12:53:10 +01:00
Florian Mortgat
cbca0f389a Merge branch 'develop' into FIX_develop_urls_longer_than_255_chars_get_truncated_in_bookmarks 2019-12-24 10:00:20 +01:00
Laurent Destailleur
22f3b69666 Fix default value for situation invoice 2019-12-22 11:59:38 +01:00
Laurent Destailleur
c0ef3b46ad Work on MRP module 2019-12-20 15:31:05 +01:00
Laurent Destailleur
4a734e53a6 Fix column too low.
Fix automatic event not found if from a module with several objects
2019-12-17 14:47:58 +01:00
Laurent Destailleur
0ef3de98c6 Try to fix conflict of several stripe accounts 2019-12-15 17:18:09 +01:00
Laurent Destailleur
7d39554797 FIX Bad type of sql fields 2019-12-13 17:16:21 +01:00
Frédéric FRANCE
57055bad03 Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-12-13 14:36:00 +01:00
Florian Mortgat
b715ecd7d9 FIX bookmark URLs get truncated to 255 chars 2019-12-11 16:42:03 +01:00
Laurent Destailleur
df7a86dd42 Merge pull request #12652 from frederic34/doxygen_societe
doxygen societe class
2019-12-09 13:02:49 +01:00
Laurent Destailleur
2b5866aca2 WIP Complete module MRP 2019-12-08 23:45:06 +01:00
Frédéric FRANCE
48564ea760 doxygen societe class 2019-12-08 14:26:59 +01:00
Laurent Destailleur
3030a9fa2a Fix manifest file was saved but not enabled. 2019-12-07 13:09:55 +01:00
Frédéric FRANCE
4c5c6b6ff1 Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-12-03 17:56:43 +01:00
Maxime Kohlhaas
83928b4708 Fix duration must be double(24,8) to store seconds 2019-12-01 18:19:22 +01:00
Frédéric FRANCE
25ed2b930f Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-12-01 16:10:37 +01:00
Laurent Destailleur
1c58cc5031 Clean doc 2019-11-30 10:59:47 +01:00
Frédéric FRANCE
b2912e688b Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-11-27 22:54:05 +01:00
Laurent Destailleur
b440f2b1f4 Fix a ref is not null 2019-11-26 08:53:54 +01:00
Frédéric FRANCE
2e5f539b2a Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-11-18 17:45:52 +01:00
Laurent Destailleur
ae0fdf014f Debug email collector. Missing unique key. Fix initial setup. 2019-11-18 11:55:22 +01:00
Laurent Destailleur
502626156e Work on MRP module 2019-11-17 01:23:19 +01:00
Frédéric FRANCE
5c0976a778 doxygen accountancy class 2019-11-16 09:58:14 +01:00
Frédéric FRANCE
6784ea9fae Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-11-16 09:21:57 +01:00
Laurent Destailleur
8ef9728470 Fix permission on file 2019-11-14 17:28:23 +01:00
Frédéric FRANCE
9dcf53c65e add tables 2019-11-13 20:56:36 +01:00
Laurent Destailleur
880ecda098 Fix name of tables 2019-11-10 12:23:21 +01:00
Laurent Destailleur
eb378b45a4 Work on BOM - MO module 2019-11-09 20:35:45 +01:00
Laurent Destailleur
7c4942b7be Fix debug BOM/MO 2019-11-05 20:14:33 +01:00
Laurent Destailleur
1b701f162a FIX #12307 2019-11-05 13:16:39 +01:00
Frédéric FRANCE
872f58f261 Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-11-03 21:48:24 +01:00
Laurent Destailleur
c63db01d5f Merge branch 'develop' into patch-234 2019-11-02 16:20:24 +01:00
Laurent Destailleur
496f93911f Merge pull request #11821 from Tim-Otte/develop
NEW Extrafields support in product supplier prices
2019-11-02 16:19:13 +01:00
Laurent Destailleur
906f30773d Merge pull request #12269 from atm-ph/new_edit_comment
New update comments is now available
2019-11-02 13:09:21 +01:00
Laurent Destailleur
036c1410c7 NEW Save user of last modification in donation record 2019-10-31 23:17:08 +01:00