-
-
Notifications
You must be signed in to change notification settings - Fork 2.6k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
FIX import missing fields on v12 #15590
Conversation
This reverts commit 40acd8a. In order to apply other previous commits from develop, before reapplying it.
…ntact-region NEW add region in export companies and contacts
…warehouse-usebatch NEW: Products Import/Export 'default warehouse' and 'use batch' fields
…ty-mothercompany-debtlimit-bank-incoterms NEW Third-Party Import new fields: mother company,outstanding debt limit,bank account,incoterms
@@ -262,6 +263,161 @@ public function __construct($db) | |||
$this->export_sql_end[$r] .= ' WHERE c.fk_soc = s.rowid AND c.rowid = cd.fk_commande'; | |||
$this->export_sql_end[$r] .= ' AND c.entity IN ('.getEntity('commande').')'; | |||
if (empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .= ' AND sc.fk_user = '.(empty($user) ? 0 : $user->id); | |||
// Imports |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As this is a new feature, it has been merged for v13 and will be added in v13 only.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As this is a new feature, it has been merged for v13 and will be added in v13 only.
Hi,
do you mean everyhing or just propal/order/invoice ?
OK, so no new features on 12.0.x. Could it be pushed to a hypothetical 12.1 ?
Other fields were exported but just missing on import, so it's not really a new feature.
I modified the PR accordingly.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If 12.1 is 12 + new features, we can But we have just called it 13.0 :-)
If it is adding existing fields into table in same table, and not exported, we can say it is a bug.
If it changes the algorithm how we load data, or add secondary information, it is better in a new version.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If 12.1 is 12 + new features, we can But we have just called it 13.0 :-)
There is a 10.5 version, but it seems to be the only one like this. I thought minor improvements could be added also to minor revisions of major maintained versions. So OK in x.y.Z you actually don't use Y but only Z for bug fixes.
Then I looked to the history and found RoadMap and Release Process
70bbdc9
to
00abbc4
Compare
@@ -194,7 +194,7 @@ public function __construct($db) | |||
); | |||
if (is_object($mysoc) && $mysoc->useNPR()) $this->export_fields_array[$r]['p.recuperableonly'] = 'NPR'; | |||
if (!empty($conf->fournisseur->enabled) || !empty($conf->margin->enabled)) $this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('p.cost_price'=>'CostPrice')); | |||
if (!empty($conf->stock->enabled)) $this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('p.stock'=>'Stock', 'p.seuil_stock_alerte'=>'StockLimit', 'p.desiredstock'=>'DesiredStock', 'p.pmp'=>'PMPValue')); | |||
if (!empty($conf->stock->enabled)) $this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('e.ref'=>'DefaultWarehouse', 'p.tobatch'=>'ManageLotSerial', 'p.stock'=>'Stock', 'p.seuil_stock_alerte'=>'StockLimit', 'p.desiredstock'=>'DesiredStock', 'p.pmp'=>'PMPValue')); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Adding the warehouse here will make the profile export to not being the profile to export product but to export stock into warehouse (you will get n lines for each warehouse).
There is another dedicated profile for that into modStock.
So i added the 'p.tobatch' field manually.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Revert/Cherry-pick import commits from v13/develop apply to v12